| commit | 7399cf0ca6a83dcda15902d4ccaa9f3e280f8a33 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 08 19:21:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 19:21:33 2016 +0000 |
| tree | 38361f19bc7c24321b207cd9f928a238caa3739e | |
| parent | d97d435c098c6d3eb52264ffa8e158fb4edc7dbb [diff] | |
| parent | fd6e7e6790284f5e8119a29492f8d02bd7dc5540 [diff] |
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev am: fd6e7e6790 Change-Id: I0fbfd17114fbcf6c4552d5f192ce17722272a6c6