diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-31 17:37:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 17:37:33 +0000 |
| commit | f2ca8f9c508342eae262348f6752bcd53aff2b83 (patch) | |
| tree | c6681eb661301224126ba0625da756e2af478e8f /rs/java/android/renderscript/RenderScript.java | |
| parent | 674cfd13af11f6fb5afc8bfe12d0170916f63b54 (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: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions