diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-05-31 17:42:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-31 17:42:09 +0000 |
| commit | d6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6 (patch) | |
| tree | f1bfffbb0f221217dfb285fa114cbe91e24271e6 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4e52453d0efe7b3e05182bf43b5193b44aa1c88a (diff) | |
| parent | 45c5f9417c011609eb1d2c9a089fd3a4a8f4048b (diff) | |
Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7 am: 3c570f9a12" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions