| commit | 1848cf03d8bbd35ef2ed6f75ee1d9c56ed60096c | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:22:39 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:22:39 2020 +0000 |
| tree | c101c040ab3f9e4c5137751db2a3fce9ed229ca1 | |
| parent | ca5a85bcb06a90b8209a04bfb30e65bc8d6403e7 [diff] | |
| parent | 5b49c68d11edb5cd9ca26415609da8e9296bfb42 [diff] |
Merge mainline-release 6664920 to master - DO NOT MERGE am: 5b49c68d11 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515 Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e