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