commit | c27bf45cb62d6d51d9db613b3639fb1868e5186f | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Jan 13 00:34:09 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 13 00:34:09 2021 +0000 |
tree | 13ade63ecd0205113d86dcd60c06d4db2df1898c | |
parent | 55e40879e8be93f6eee36a8dca7d0551d25e88f0 [diff] | |
parent | bbd9fb5c27045558af4368eae7edad2e83152307 [diff] |
Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d65a0465729426fb038004cd80a15ca9e438b0e