summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-11-14 10:21:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-11-14 10:21:03 +0000
commita077229ab01dbd7e1d6347d042007e23b8f2213f (patch)
tree30e82b962af4035e2ad0e9389ec03ee4fe2a182f /tools/aapt2/java/JavaClassGenerator.cpp
parentcdee25d735ba32462870f60e490b746bde128569 (diff)
parent9c92cd2e87b6e08b4f487acb74e771e8663e2f36 (diff)
Merge changes from topic "am-5e44d23882d545a38f0ea8d1f78a13fa"
* changes: Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b am: 8fd59b38b7 Add @TestApi for DownloadStateCallback CTS am: 63c5fd60ac am: b96d49e91f am: caac5df325
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions