| commit | c7ab3048feb3433a7f11d7a9ff582835a647e41f | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 08 19:50:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 19:50:45 2016 +0000 |
| tree | bafb932b85120cd5fa01250e77d9cdd8882cf41b | |
| parent | 3530ff2df217fed15f3d7a8f0fa4e763d8c65767 [diff] | |
| parent | b995b74377316ef29b85744480295e955feafdb8 [diff] |
Merge \\\"QS Edit: Extra extra make sure hidden when locked\\\" into nyc-dev am: fd6e7e6790 am: 7399cf0ca6 am: b995b74377 Change-Id: I4a68e6325f48706be28ca352fb74794470a32d2a