summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2016-07-07 01:31:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-07 01:31:50 +0000
commit2dbe9b47fda446b58f086b453578df0a52b27107 (patch)
treec81e6cee4d18e04b1252f66882acf99f4e399b88 /tools/aapt2/java/JavaClassGenerator.cpp
parent6d8cffc4e9a7782131b9828fc77e60054875eff2 (diff)
parent6f93a6c2c31b7dc45e96624f029398c50b73265f (diff)
Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d136 -s ours\" into nyc-mr1-dev
am: 6f93a6c2c3 Change-Id: I160e1a702a5e879da775ddf9e360ef5c3d206973
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions