diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-30 12:42:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-30 12:42:55 +0000 |
commit | 39e0d7e4e0d1509efdf71f33195d0ed099a96a20 (patch) | |
tree | 23bf744da381315f26099e86da62d75bf6aa9820 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f88dae575ca166d811c40072611ec8483368c707 (diff) | |
parent | 2895b2d9005b93d1ba480cf7042ed2810199d883 (diff) |
[automerger skipped] Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" am: 55a580b253 am: 575365367a am: 2895b2d900 -s ours
am skip reason: Change-Id Ic97717e5fc32d97837e218fe769087b5abece2cb with SHA-1 df82804342 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I884c512c990fbaac60e7f93ed78b41a2b3bfe316
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions