| commit | 31784f6cbd9353363cfb25e885f053ddf6930f92 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 08 02:15:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 08 02:15:41 2020 +0000 |
| tree | c75405345c6509a81f76f596fabfef0b4949f408 | |
| parent | 9a6c95e61edf3dbd771feda0090f30f1632c5094 [diff] | |
| parent | 5bb6cfd7b14bc3bbfc613a0d5479efbe7a8ca717 [diff] |
[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller" am: 87099b04c3 am: 5bb6cfd7b1 -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: I7b2839400e76302a9501a712ecd3dd8356689d37