summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-08-16 12:23:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-16 12:23:25 +0000
commitd1e7fc23aeb7f5d631d2ae53d252504ba928e409 (patch)
tree7ab1b3b46a028f4ccfd50a2fc280aaee8e54e5a2 /tools/aapt2/java/JavaClassGenerator.cpp
parent837282ea25ae130735b3d17a55ff61cf8e0c4010 (diff)
parentcd7393c641e5cec6cf009e5ce227e59155e9fb00 (diff)
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 am: f2ac860b7c
am: cd7393c641 Change-Id: I7ee60daa9c4266e9b9179032815dd7267e06377f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions