OSDN Git Service

[automerger skipped] Merge "Attempting to fix the black flicker" into pi-dev am:...
authorJohn Reck <jreck@google.com>
Fri, 1 Jun 2018 13:14:33 +0000 (06:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 13:14:33 +0000 (06:14 -0700)
commit3db1f47c4e9b2ebd70cdbdb261a96fbb22026611
treeb2f39eeb81fae52886ae8369208af79aaa03e65a
parent427ae7d48e504ee173377e06c9c59382f98c4a7d
parent8b3480c66746a26e6bea9d4a5dd453ce1145435f
[automerger skipped] Merge "Attempting to fix the black flicker" into pi-dev am: b559512508
am: 8b3480c667  -s ours

Change-Id: Ic8925870444b241610bd500a7f4d6ceedc989df8