summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-08-18 12:36:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-18 12:36:31 +0000
commit9d071388919fab803df6b7e35d1149de996dfdda (patch)
tree392762843b3c25fac76aac95b78815fb5f866caa /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc5b37d1bcf48ef93a1970560f2bac422cb3050b4 (diff)
parentc61e1cca859bcdd6d80d2a41b7e60750a9ad4092 (diff)
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 461f4eb099 am: beae621102
am: c61e1cca85 Change-Id: Icd8e328e3c810a644bfb83798bd42fed8dc70425
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions