| commit | 832d4bea8139defc9717bb153c95947f3c3065c5 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Dec 02 11:36:25 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 02 11:36:25 2019 -0800 |
| tree | 28d21626255939eedf90b9057207b572d0204331 | |
| parent | ca0a066ccc899d9a40e9db084fb1c4aa552bba4d [diff] | |
| parent | 85d17d0a9a2000ea7b4ffefc6d28a25be81a05ff [diff] |
[automerger skipped] Merge "Convert LockSettingsService tests to JUnit4" am: 78056c77f3 am: cec994c03f am: 85d17d0a9a -s ours am skip reason: change_id Iaf280718d4c28966b60c76dda90a4674a24f26c6 with SHA1 e7178a2358 is in history Change-Id: Ib44a48cd6d4a9e84a70859f8ddc8eec9a0665710