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 19:58:59 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 19:58:59 +0000 (19:58 +0000)
am: 998b21c6b6

Change-Id: Ida9b5486a8aee873893a7d14b9aa07b83692049b


Trivial merge