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