summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-07-28 19:05:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-28 19:05:58 +0000
commitfcc08268ea0e9a1e8439c9d0692607562ecb3637 (patch)
treeb5e71bc1d7dccbf1587fa63f957202586cc15f07 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent45b95acd39bec31f35b9d0dfffbf5cec7b5ac3a1 (diff)
parentb813e71e8cbc0fdb8c426b10f884530b2f16d3dd (diff)
Merge "Move conscrypt from the set of non-updatable APIs" into rvc-dev am: 4963e51f97 am: b813e71e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11408320 Change-Id: Iee98f74dd5fab19ae96b74f32524585cec5624c2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions