| commit | 6964d116722cb30dbda8816e93251ae7cf0a3760 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Feb 02 10:46:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 02 10:46:37 2021 +0000 |
| tree | 1a2089fb82be0e27a3954acacffd12684f465711 | |
| parent | 03b2f0dfda29634824378062c106b6bd95e77865 [diff] | |
| parent | 7b492642370836f9adf1cdb19ff0e9712e654e9c [diff] |
Merge changes I4f38a539,Id4f6c7f4 am: 7b49264237 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id68e4e0ff5995bbf04859834fb2aa0936ef651bc