commit | c8cdc6917c82fbe6ccb6e46f76996d84507350af | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Sat May 15 16:53:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 15 16:53:30 2021 +0000 |
tree | 9e2042877ddf404fac45908b78c72ba6c315a917 | |
parent | f84276bde17ede54a5f162cbaea6857fcb6bc736 [diff] | |
parent | 2a7ab18c0b6cfc08f8e23136e45c8ec1275a19e0 [diff] |
Merge changes I3ba50cbd,I970ee365 am: 2a7ab18c0b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859 Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321