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)
commit36a50e7b8a05bbb2490d419b3a2006a755a3d409
tree0469dce3c68e89c209573a7327981ec51893666d
parent4c7fe9d129b9b1444700f0191aee2cb3ffb9b769
parentd14f0980da7026d1eaace30ea9c9013d39d6499a
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am: b6ee436eee am: 998b21c6b6
am: d14f0980da

Change-Id: Iabd07f20674194d75aad4b375e362198516c0173