Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev

am: b6ee436eee

Change-Id: If0dbc782680fe95d1a460ab8109ed94fd0419e25
This commit is contained in:
Chong Zhang
2016-08-12 19:49:18 +00:00
committed by android-build-merger

Diff Content Not Available