OSDN Git Service

Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering...
authorChong Zhang <chz@google.com>
Fri, 12 Aug 2016 22:26:33 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 22:26:33 +0000 (22:26 +0000)
am: d14f0980da

Change-Id: Iabd07f20674194d75aad4b375e362198516c0173


Trivial merge