| commit | 4804bd1ca9ddfaacbb34dccf5ba6b5cd292037ae | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Aug 17 18:54:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 17 18:54:29 2016 +0000 |
| tree | 253c9ea21d1114331716a28ba42f97bd437ee7c3 | |
| parent | 9322632f6a62565b57186ed17c03dd0860eabe20 [diff] | |
| parent | 9b0c58b4935d32087f6ba5d71bbb711896701c1a [diff] |
Merge "Fix a flicker when returning to the lockscreen" into nyc-mr1-dev am: edddb17a67 am: 9b0c58b493 Change-Id: Iaac10c803c5b3b48de1c2c8ce857fa17bef305ab