OSDN Git Service

DO NO MERGE -- Revert the following two commits as they're causing flickering am...
authorChong Zhang <chz@google.com>
Fri, 12 Aug 2016 22:20:54 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 22:20:54 +0000 (22:20 +0000)
am: 8a688436ac  -s ours

Change-Id: I9326eeee2a34aca480940dc260fe67ec6c20f02f


Trivial merge