OSDN Git Service

DO NO MERGE -- Revert the following two commits as they're causing flickering
authorChong Zhang <chz@google.com>
Fri, 12 Aug 2016 19:49:16 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 19:49:16 +0000 (19:49 +0000)
am: 44bd57ee25

Change-Id: Ie4504d027160fd58c3dab7dc372849f2a1e4ae51


Trivial merge