| commit | ca3a4c6c0fa6c548316d5a405a3280c9f1fbf499 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 08 20:28:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 20:28:08 2016 +0000 |
| tree | eb20d474d486190a0a3bfc6a0f14e78affd26517 | |
| parent | afeed415264f8c40a358cc1a40c27f2f06da83cb [diff] | |
| parent | bbcb733d802e9fbddaff899e0def8d250e803ebc [diff] |
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev am: bbcb733d80 Change-Id: I048576c6a65ac4ca884dbca131b050dc8599ae3f