| commit | af1f784ee03ec1dbb47cd76107c078cf92dab502 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Apr 29 06:02:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 06:02:44 2021 +0000 |
| tree | 9020494fccec8fbe29b0e251504bd56d3251ce99 | |
| parent | 97a9cfb6056de7f20c92f783766e2895551ffddf [diff] | |
| parent | 38762c75d1bd9d39cc391a404cfa26d2c91c2d32 [diff] |
Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690266 Change-Id: I527307961df8d8e8932b704cb63c959b0f6f4ee8