| commit | 6f59202300ab6e686636caa1916023ffe323afb9 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Apr 16 13:17:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 16 13:17:51 2021 +0000 |
| tree | e3e90847097e7769d4acbae7c856172ed41f51cd | |
| parent | d30fc17ddd32e3947f17b14a4a4c20d689d0c228 [diff] | |
| parent | 3ccd60f47e0649d23a4b98b1403123e8ee19c5d9 [diff] |
Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899 Change-Id: I9b6a9f20aa087934ce2045e664b9f9d713fbadb2