summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-07 01:33:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-07 01:33:11 +0000
commit23a027d9117a6dfd37f6f7ea9265e651493523ed (patch)
treec81e6cee4d18e04b1252f66882acf99f4e399b88 /tools/aapt2/java/JavaClassGenerator.cpp
parent54a704bfcd8c60da0c80eb330436f7f3244fe22e (diff)
parent2dbe9b47fda446b58f086b453578df0a52b27107 (diff)
Merge "Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev am: 6f93a6c2c3" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions