diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-31 17:30:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 17:30:54 +0000 |
| commit | 3c570f9a1261532952f0fc11aefb53b0e558625d (patch) | |
| tree | 9258850f397b47014011e12ac8f17595c68c58fb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 094f3f83285bceb7c21012ccb7011696ce91ef18 (diff) | |
| parent | 21f98459b7740f57f6fd0415298cb5f5c0c7e0ae (diff) | |
Merge "Do not get device owner admin info when device owner is null" into nyc-dev
am: 21f98459b7
* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
Do not get device owner admin info when device owner is null
Change-Id: I8bca370306be7cafe536dc57d1b1d53dd0f50297
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions