| commit | 229a149a9104116c80ac3d012cf531d399ae997e | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Apr 16 14:17:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 16 14:17:42 2021 +0000 |
| tree | 4ef97b17d43a74e4b23409506d7b1535a50d22de | |
| parent | 43dfe44a0f339bd5f2b536b5db054f148abfbf3e [diff] | |
| parent | cf830697731e0cfd89fb0b4dbdfc2e82eeea3d6f [diff] |
Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e am: 6f59202300 am: cf83069773 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899 Change-Id: I2614db2ead6d24e11fa6e3a83ce1e443202610a8