summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2016-12-13 04:21:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-13 04:21:18 +0000
commit5cf11944f088d37a9dd8fc2cc010c13ff31eb9a3 (patch)
tree19de3d41a760c20261d8da2f63c499089348b65e /tools/aapt2/java/JavaClassGenerator.cpp
parentff30f24e76434b3c9a6717d9426277c56fc2b87c (diff)
parent897ff1c5ad1b831e6bdf612b05f2e157d3cf0905 (diff)
Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev am: 6674f7a3b4
am: 897ff1c5ad -s ours Change-Id: I1ad2490adc9266aeba0dd0b47c965ba395784106
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions