summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-10 20:06:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 20:06:06 +0000
commitaacc07ff728109c6ca21337e427936c064d93de0 (patch)
treeab6107f7a18f2d5bd1e8e1b7148af656298a19ef /tools/aapt2/java/JavaClassGenerator_test.cpp
parent15a7bff0f1d136577df1eb95f01fd7133aef6983 (diff)
parentb467333c5b8ca80a7937b7d3a17d9f239c378633 (diff)
[automerger skipped] Merge "Revert "Add a blacklist for preinstalled carrier apps."" into rvc-dev am: ddb640a883 am: b467333c5b -s ours
am skip reason: Change-Id I5d07bd7ce4bde11a287f44ad2ff97370d4c30db6 with SHA-1 c4b36e9d00 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11809242 Change-Id: I54712e005d73944dcf8b9feb5eac82597b387953
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions