| commit | a01e2212c849a507e84d5cad3e8f0267773d7295 | [log] [tgz] |
|---|---|---|
| author | Andrew Zeng <zenga@google.com> | Thu Mar 16 23:22:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 23:22:05 2017 +0000 |
| tree | b416b474b576cb40b811d170203b20a66380dbc5 | |
| parent | 4b39c15da0f5d100b9ce6fc29a8f499362c53542 [diff] | |
| parent | 4aff3d53efc552aa30e25bf366bcb6e956d8b0e3 [diff] |
Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef Change-Id: I17880622c489df79eeea5116b3afe3c462b06554