summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorGreg Plesur <plesur@google.com>2016-10-13 21:12:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-13 21:12:56 +0000
commitfd6399698a2704f86a75621856153c7ce219d200 (patch)
treeec95387329e45f8b433f96ec74a0fc0669a64491 /tools/aapt2/java/JavaClassGenerator.cpp
parent43ed3a5b6af89da9a89c5876fde6e4d343bd2652 (diff)
parent216ee1f0e76f6a36bebb5490c951db2a5513ae03 (diff)
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev
am: 216ee1f0e7 Change-Id: I585c709c3a8648e754779c71497d18a35b321bb7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions