commit | befa7e20f7cecb085c792597a1de1e2f30766216 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Wed Aug 12 17:46:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 12 17:46:33 2020 +0000 |
tree | 472694bdf588d7e6ad7ef3fb832a2be974384f9b | |
parent | 51ded6860147bf7090ed927a20158d5034094d32 [diff] | |
parent | 49c52755d22e3c36fb0e750d5efa950524f15521 [diff] |
Merge changes I05b83c47,I5a840ec1 am: 49c52755d2 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233 Change-Id: I56b9faab494eacdcbfd6ca0df1b6684d7ee69d4f