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