commit | 8eb797e11bd16586a26455d628c917f145a27e20 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Wed May 19 12:41:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 12:41:44 2021 +0000 |
tree | 0d704a6cebbf498b1ee3b6bdae06ffdac0883c85 | |
parent | 3013dc5e6eaa7e7e6314852b1985ce3e12b096ed [diff] | |
parent | 458a60dab5caa56487fd0395f81fa068a7bb1e0c [diff] |
Merge changes I3ba50cbd,I970ee365 into sc-dev am: 458a60dab5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500 Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70