diff options
| author | Peiyong Lin <lpy@google.com> | 2020-12-15 22:02:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 22:02:25 +0000 |
| commit | 5bb35b379455a6fb308e8763ac612c5fe80f034c (patch) | |
| tree | 516867fd0950bebe747ca08a2181694c738abb08 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0f04a2e670d1d27176bcd3e18e29cebea2dbf868 (diff) | |
| parent | 60cc40c8310b174e52f5c740a5128d3a677e2cec (diff) | |
[automerger skipped] Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245 am: 181ff65039 -s ours am: 60cc40c831 -s ours
am skip reason: Change-Id I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff with SHA-1 d22eebefdb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530839
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide16650f8d246620eae80e56a073daade1617a2c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions