| commit | 9e07e38369d28caa9436eed4efe23fc73d0fa039 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Aug 12 18:01:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 12 18:01:26 2020 +0000 |
| tree | b726724b9263473c992544135b2747dde8860e06 | |
| parent | 53cb3689e3555016002f543e4f34a520f33a8935 [diff] | |
| parent | befa7e20f7cecb085c792597a1de1e2f30766216 [diff] |
Merge changes I05b83c47,I5a840ec1 am: 49c52755d2 am: befa7e20f7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398233 Change-Id: I15c7258ee3b45f7c9bf65e627140fe7fb3fccf95