diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-08 02:48:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 02:48:08 +0000 |
| commit | ce37633d43a3578d4e378212444753777d46c003 (patch) | |
| tree | 905f6e116ebaeb7be3f188bb3f60193322af48b4 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 74c4feb63796ea79145eddecdb150e404bd11c9e (diff) | |
| parent | 7a24828a71baf77d8fe1cf6ec8deebb1d853256a (diff) | |
[automerger skipped] Merge changes from topics "pc-enum", "pointer_controller" am: 42875c3a99 am: 3d90c6dbe3 -s ours am: 60b103b632 -s ours am: 7a24828a71 -s ours
am skip reason: Change-Id I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea with SHA-1 12956dc51d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355812
Change-Id: I2d2988deb3072c934b71bce1d634ff84434cfac1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions