| commit | 9f34cef41f7242e4d6604a8f63a6c35a9cd9a37b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 08 02:48:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 08 02:48:02 2020 +0000 |
| tree | c75405345c6509a81f76f596fabfef0b4949f408 | |
| parent | f31211a2f24994e319928accb86a9c7e248e7ca9 [diff] | |
| parent | 6deb290507f427e8c348cb118c4c5771a22d94d1 [diff] |
[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller" am: 87099b04c3 am: 5bb6cfd7b1 -s ours am: 31784f6cbd -s ours am: 6deb290507 -s ours am skip reason: Change-Id Ie5ba68a5082fff6ccc85ab01ff49344b73d0bb1b with SHA-1 976db0c3a2 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1356005 Change-Id: Ibec374e884e1f99c46ac710b0db09271fe8c5f47