diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-07 22:17:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-07 22:17:38 +0000 |
| commit | 286bf801dd3b114ea24adc5f4ab0df6e973cf153 (patch) | |
| tree | 686f0637bfbef571359e60c9d5bfd4a45cb86d0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8694c4b8d25bf862c1a2efea0982700600d85c80 (diff) | |
| parent | ced175f0253c2098f4429e761e5443e3f172260a (diff) | |
[automerger skipped] Merge "Move PointerController from sp to shared_ptr" into rvc-dev-plus-aosp am: 78ec762f0c am: 616d2e3842 am: ced175f025 -s ours
am skip reason: Change-Id I4e665d00c56b44c9c1a4ea8cb27ffd10ade3315b with SHA-1 0cde5911bc is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099132
Change-Id: I2e7ed1546bf41791e73290cebf7bce9aee533e40
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions