| commit | f20f1b08979e8be38adc9b99abc95d901de252f7 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Wed Mar 31 21:36:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 21:36:55 2021 +0000 |
| tree | 4f8c5b1b80fcf128902e1479302f1438965a1c95 | |
| parent | 31e043b357868f9c3048ef2abef76d616c6bf6b4 [diff] | |
| parent | ab765e0ebe001b48b17c2b3081612cbfc3eee9d1 [diff] |
Merge changes I2d30b75c,I57ecf4f5 am: ab765e0ebe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645915 Change-Id: I7c0c4887c813c8b0a61b498c07d3444d2f9689d9