diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 17:15:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-29 17:15:03 +0000 |
| commit | 0b3ac6576c947745d90f89dc9353e2f6909d5243 (patch) | |
| tree | 84bb4254d6028bec9bb9ecff9a58578c62a215fd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1ff8d59b82473ac1c2d70b9e35a4c7d99ac9da47 (diff) | |
| parent | 4b17be70ed005166a9969144799ff61f2328d307 (diff) | |
Merge changes from topic "am-68b4bdc548e248eeb06114366e334afc" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "rollback" into rvc-dev am: 724bc71208 am: cb9a6388e8 am: 3c8c6eea4d
[DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab9f am: 049beecf55 am: 270e44ae66
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions