Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev am: edddb17a67

am: 9b0c58b493

Change-Id: Iaac10c803c5b3b48de1c2c8ce857fa17bef305ab
This commit is contained in:
Jorim Jaggi
2016-08-17 18:54:29 +00:00
committed by android-build-merger

Diff Content Not Available