summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRobert Snoeberger <snoeberger@google.com>2020-07-09 16:10:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 16:10:05 +0000
commitd7190d56a3e56053a33c814b33f8b094757f1a5d (patch)
treea9839ef2586b0dd3c5538032257727ab63cb89db /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4f85c6e13c95a072392bdc4f53830acfb6842ce9 (diff)
parent2c8c8ead189d26d6181bb3eeefd6d9d0a97939ea (diff)
Merge "Migrate from old key when combining device and media data" into rvc-qpr-dev am: 20ef70906c am: 2c8c8ead18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12052992 Change-Id: Id251bbe250fbeca0490fbb95bf393255d83c6a32
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions