commit | 58cac0fffc5f7101f56fe51d929430ffb5fa7d08 | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Tue Jun 23 02:29:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 02:29:12 2020 +0000 |
tree | 9b66f22e1eb2f80db33899839cdfdc50c2666c15 | |
parent | 3117c039fc634fc4ba033c6b3500336630d08965 [diff] | |
parent | 1da3dc6a33698175588ce923042e545abd2d8640 [diff] |
[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: ab39e0da88 -s ours am: 351b5b549c -s ours am: 1da3dc6a33 -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: I2b797702edd478353ce01cc6d6af7da5f9d4e541