| commit | 0f10ae4f2abcc5b2e57484f22f5b62a3c906035e | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Jun 08 20:34:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 20:34:14 2016 +0000 |
| tree | 510e4a3535716b4b942af27194311c9734cf47a1 | |
| parent | a779c5fe8fa6dd11cd9414cd0bf8c2ed75e691ca [diff] | |
| parent | ca3a4c6c0fa6c548316d5a405a3280c9f1fbf499 [diff] |
Merge \\"QS Edit: Extra extra make sure hidden when locked\\" into nyc-dev am: bbcb733d80 am: ca3a4c6c0f Change-Id: I51d749813c27f76ae6f7d2ada29e0da83007753e