summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-05-31 17:41:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-31 17:41:07 +0000
commita263edf14f67f098393311354fc424b710fae933 (patch)
tree2b9ae47c1b4312bc88f9f7625f26b9868cdfb883 /tools/aapt2/java/JavaClassGenerator.cpp
parentc87bf0ad88a23b14065d41371d0f27a80e37f15e (diff)
parentf2ca8f9c508342eae262348f6752bcd53aff2b83 (diff)
Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7
am: f2ca8f9c50 * commit 'f2ca8f9c508342eae262348f6752bcd53aff2b83': Do not get device owner admin info when device owner is null Change-Id: I29edf9a63d29c8016ee88f9ebe93d3533c09dbed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions