| commit | 824a156a78c1e367432445f0df071f6aa2ae2e08 | [log] [tgz] |
|---|---|---|
| author | Matthew Maurer <mmaurer@google.com> | Wed Aug 26 05:59:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 05:59:30 2020 +0000 |
| tree | ad27a2890e88bc74b8dcd94e6ea3ced077d4983d | |
| parent | 6a299a54f30e8a4df2c51b059d303890e7560b3e [diff] | |
| parent | 79642dd98ba0abf92c5ec85f02dc66ead9d5ffa8 [diff] |
Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870 am: fcad4767db am: a39c2da539 am: 79642dd98b Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1397051 Change-Id: I9d02a67d7b24c58fc258792fd4bb7ef686ec6dcf