| commit | bf60b9c8c379fa693befe2c0f4cb758b74c2d61c | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Oct 07 14:55:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 07 14:55:43 2016 +0000 |
| tree | 9fd24d2a9dc71222a1c61030fde2098edd861808 | |
| parent | 42f5aa187a05a1288dccf09cce35fe94e5fddde1 [diff] | |
| parent | ce32ea697f02ce6f1aed05e769f5e88138ed08b0 [diff] |
Merge "Reload state when user unlocks" into nyc-mr1-dev am: a92006ef6c am: a58cb2e4d7 am: ce32ea697f Change-Id: Ib4a3b490986a69e4396fbfe399e78d4c03e0973a