| commit | f28cadc9d0aa603652e42a15f2234ca5fb993f26 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Sat May 15 17:24:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 15 17:24:42 2021 +0000 |
| tree | f88349b48d6e5a5719f9698223bfbdcf4ad2e157 | |
| parent | 5826897604cf81e3048fdb50717a12c9b6e15ef7 [diff] | |
| parent | 0d3416dceaa058b87d1bc956ccea816a3c7e3f7c [diff] |
Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: 0d3416dcea Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859 Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b