commit | 373c69331c4018537b18e8edaa6e47a468c6eabc | [log] [tgz] |
---|---|---|
author | Hui Wang <huiwang@google.com> | Tue May 11 21:21:22 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 21:21:22 2021 +0000 |
tree | f1ff8e9e1bd3d6201cb8b86abda9aca39bbd0a16 | |
parent | 4c9b195caed851e01322a9509aaa476f15e760dd [diff] | |
parent | 7d68f0d2748dc48096217d22d1a40e636436fac6 [diff] |
[automerger skipped] Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a am: 1b8695828d am: 7d68f0d274 -s ours am skip reason: Merged-In I7df3c660326c6bee3db4a4d3a032ce8f1941b15b with SHA-1 e5017913a4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695125 Change-Id: I16e810ec5313f0e39a6b3e502d0800d2da718d18