| commit | d4e88e2642652acdac67d2263a081e4b3ef56158 | [log] [tgz] |
|---|---|---|
| author | Andrew Zeng <zenga@google.com> | Thu Mar 16 23:40:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 23:40:09 2017 +0000 |
| tree | 52aeddcdc9fa484346b065e7ddd969885c478bfa | |
| parent | 8ade276115e00828cf5de7f0acb6e8c62ac30ecd [diff] | |
| parent | a01e2212c849a507e84d5cad3e8f0267773d7295 [diff] |
Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef am: a01e2212c8 Change-Id: Id333403e3a989e233a97760b716055b3abd186d6