summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-11-04 19:09:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-11-04 19:09:41 +0000
commite5227d443e7b3c05f859d587dfe386a48db8814b (patch)
tree0ab86dd62ecf22672fa4376fd242b974892cfb5d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent94d0bca68f267e9d3e6d514e19758a27a4c865d9 (diff)
parent5729d92a8556a4b6fea54480a789a317990b9a33 (diff)
Merge "Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am: e50a485c22 am: d4ef6421e5 am: 52df5e2c1b"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions