commit | a39c2da539c709b0f0d5103f5ac6b3d0553b2bf8 | [log] [tgz] |
---|---|---|
author | Matthew Maurer <mmaurer@google.com> | Wed Aug 26 05:21:11 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 05:21:11 2020 +0000 |
tree | 8e4b5c96a811b9b6c5f0aa54707edbcf81894702 | |
parent | 348c58c5df44c763208228793a5b7c616972efd7 [diff] | |
parent | fcad4767db8e1fcb883f1de2a20f333974c5300c [diff] |
Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870 am: fcad4767db Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1397051 Change-Id: I2f8a67c5e47b9bd6c2ed374413d6c0e9cf78c83c