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

am: 998b21c6b6

Change-Id: Ida9b5486a8aee873893a7d14b9aa07b83692049b
This commit is contained in:
Chong Zhang
2016-08-12 19:58:59 +00:00
committed by android-build-merger

Diff Content Not Available