| commit | f044795629a4212941ba579864eb6ba771cecdda | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Nov 30 15:01:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 15:01:45 2020 +0000 |
| tree | 9d4d3d26ab28b100e054ea5edfb4fb053f8ed85d | |
| parent | a2f800ca789a5d1c8e63b35a7439c0bca764d915 [diff] | |
| parent | 5dab5fb9c4d71da01a7ccfae9b68457b18a2618b [diff] |
Merge changes If2201f39,Ia1c366c5 am: 5dab5fb9c4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1509889 Change-Id: I6ad54ba833d242ed790123c381a308ef678e4d4d