commit | 14659d0a885dc8cbd66222237ae12f018b8e3c59 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 15 22:00:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 22:00:48 2020 +0000 |
tree | a2dfb1e5570f9fa6df9417048d4e11a8f48a848a | |
parent | 0eb1190094435e6574883c292ea90f6757535878 [diff] | |
parent | 7d486bd054ab4fd1f6f048261ba0e3ec1f8af68b [diff] |
Merge changes Ieae66cc7,Idf94ddb5 am: 7d486bd054 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512886 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c380bab3d814c44d4df5b0267fe45ee1f2d6f0f