summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-04-02 17:40:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-02 17:40:17 +0000
commit842760bd7d301a00f6f7406fff807af26d7bd9e5 (patch)
treea939a7cef98bfbfd8db304956427cf5f2a045f63 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2736d4cb38fefcbe47ce82b6ddea596f489d4ad4 (diff)
parent184dc85643dab64ddc60d0918ec3c52bfc0f32ba (diff)
Merge "[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823 am: aa9e302a63 am: 86860a5254 -s ours am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1 0a2d8cbb26 is in history"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions