summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRobert Snoeberger <snoeberger@google.com>2020-07-09 21:25:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-09 21:25:41 +0000
commite4e09739641df9eddafb469deda695d3c996393b (patch)
treeaf815a8b2fb99f7ae4a1b27f698df80d9bafee8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd3bde5b67cbb80477118832e580802896e7181a6 (diff)
parentb13a3c8ec8bd0f0d6914ffe08a5e36d7c6f9ad76 (diff)
Merge "Migrate from old key when combining device and media data" into rvc-qpr-dev am: 82ec6ed285 am: b13a3c8ec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12118657 Change-Id: Iba40c9afe86614d5f300c136f809fca6740aa7a9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions