tree ace3c76dc55726345de41402150e2b9b3e3292cd
parent 5012ca347fc671ffd3f8f4bd94555884f24973b4
parent 9322632f6a62565b57186ed17c03dd0860eabe20
author Jorim Jaggi <jjaggi@google.com> 1471479422 +0000
committer android-build-merger <android-build-merger@google.com> 1471479422 +0000

Fix a flicker when returning to the lockscreen am: d11d1a9486 am: afaf4ac7a9
am: 9322632f6a

Change-Id: I9cd7ead4caa2843e3063d55ea357e9e989c72f0e