OSDN Git Service

[automerger skipped] Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether...
authorBryan Ferris <bferris@google.com>
Wed, 8 May 2019 23:43:20 +0000 (16:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 May 2019 23:43:20 +0000 (16:43 -0700)
commit14eda77e753dd27a923e8778c9a4efd9d1217127
treead4ed48cea9d0667281918d7995e9cea692d051a
parentcf1c6424a49108d72a0d70a1fd33bcc5a4ada788
parent1dc64d287fd8695c7a413b56eac747f3def51476
[automerger skipped] Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether we have captured secure layers." into pi-dev
am: 1dc64d287f -s ours
am skip reason: subject contains skip directive

Change-Id: I6464ce7e57fdf348123b48bafd6664278b8541a3