| commit | 18a8af21b52e71a8f3f04c8834b5531ebdcefc20 | [log] [tgz] |
|---|---|---|
| author | Andrew Zeng <zenga@google.com> | Thu Mar 16 23:52:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 23:52:44 2017 +0000 |
| tree | 7aa7308fd1e1948a5ba23b005524d6a811c6a4ec | |
| parent | 24b7831f8bf19cde7b07ed24216b381b1469dbdc [diff] | |
| parent | d4e88e2642652acdac67d2263a081e4b3ef56158 [diff] |
Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef am: a01e2212c8 am: d4e88e2642 Change-Id: Ie7d409e8ef3ec5c3201bcaf0ae125ca71dc10c08