| commit | d72053c65b445fc116f0d4be6f9cf35e784eba8c | [log] [tgz] |
|---|---|---|
| author | Linzhao Ye <lzye@google.com> | Sat Oct 10 20:27:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 10 20:27:47 2020 +0000 |
| tree | 7ae6b8a96140e4b2bc01305ada374cac7a4f5753 | |
| parent | 98f6ffe31b92bbafeb569b17db2aa004293bbccf [diff] | |
| parent | 44c9a212cb996f86793a6a5f4c030eb94ad2ff7d [diff] |
[automerger skipped] Merge changes from topic "ToupadPointerCapture" am: be23210bbe am: 888e5ea116 am: 1f1a42b563 am: 44c9a212cb -s ours am skip reason: Change-Id I3a02400eb648fd4d5dc96a21c5d929e4f9a2428a with SHA-1 8fa1728369 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1447900 Change-Id: I37cdb616dd2bd8fb147c838c33f1714930572a39