| commit | 114e42ec51c39081d65b096d525d6318de6ff40b | [log] [tgz] |
|---|---|---|
| author | Bryan Ferris <bferris@google.com> | Wed May 08 18:09:27 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 08 18:09:27 2019 -0700 |
| tree | 79d0beb17bf5ef7d816b06ab19383b207b5d83a0 | |
| parent | 7da02b171e9980a76eddce2be4fa12d00b5a7dc0 [diff] | |
| parent | 55162b5715898e7cc6af77f29392ca6d6242f987 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether we have captured secure layers." into pi-dev am: 1dc64d287f -s ours am: 14eda77e75 am: 55162b5715 -s ours am skip reason: subject contains skip directive Change-Id: I4bbe7665fd0345d10f4e4c3e29deec7b829d2387