commit | 351b5b549cb2cba2eae16a652db6e04e69f031bf | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Tue Jun 23 01:58:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 01:58:33 2020 +0000 |
tree | 02370b92e495b8cf7f54bedc8731909201aa7093 | |
parent | 2e5c0a2f435a83408e1ac18817079c50c47b5a66 [diff] | |
parent | ab39e0da887c3a43bd87d7a18243156c4ded6baf [diff] |
[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: ab39e0da88 -s ours am skip reason: Change-Id Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74 with SHA-1 16e246647b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345374 Change-Id: I8d645b01be7245e989707f5f89ba2d458a0ce81a