| commit | 1e197dd9921582e6c05d8698e72c59b435c5210f | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 09 01:45:00 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 09 01:45:01 2016 +0000 |
| tree | 923a74b01607b1d83f086256b30efa3e9fdca1a3 | |
| parent | f716a049d4ab6fb2a049d6e2125dec9cb7eacbfd [diff] | |
| parent | 1ae8afa555e293c7dc398e7c3fc32765aff1be1e [diff] |
Merge "Merge \\"Always re-enable keyguard state when the user switches.\\" into nyc-dev am: 9e94c455f8 am: ff0433c200" into nyc-mr1-dev-plus-aosp