summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-10 16:52:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-10 16:52:16 +0000
commit9d6f823327261724e057e76b919d8dd5e9808087 (patch)
treeb0ed761e4d31586b738822901b604e350ce401a6 /tools/aapt2/java/JavaClassGenerator.cpp
parentb8342102f079706c1cbd1d64348f382b22caa41c (diff)
parent1dcd163a83870b9e298aa82439a87cf0028d9131 (diff)
Merge "Merge "Add timeout for setPermissionGrantState" into qt-dev am: 3baa0b34e3 am: 155cb7c247" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions