commit | 7866d76e4a65d1e0d4c4142161cdc91eb6821c52 | [log] [tgz] |
---|---|---|
author | Branden Archer <brarcher@google.com> | Fri Oct 30 16:45:06 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 30 16:45:06 2020 +0000 |
tree | 7865e177fde6ec64b00073af9bd4ab1933c46aac | |
parent | 34a565027e2d7460d7e0c6351386657cfd603360 [diff] | |
parent | fe60632e0615ff85ebe3a0649857f0f1c0be98f3 [diff] |
Merge changes Ic547e18b,I7b0f6b70 am: fe60632e06 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1473338 Change-Id: Ia34db089603e9d4ceb23d101ae7438bf794abdc6