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

am: edddb17a67

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

Diff Content Not Available