diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-31 17:41:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 17:41:25 +0000 |
| commit | 45c5f9417c011609eb1d2c9a089fd3a4a8f4048b (patch) | |
| tree | 2b9ae47c1b4312bc88f9f7625f26b9868cdfb883 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c87bf0ad88a23b14065d41371d0f27a80e37f15e (diff) | |
| parent | 3c570f9a1261532952f0fc11aefb53b0e558625d (diff) | |
Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7
am: 3c570f9a12
* commit '3c570f9a1261532952f0fc11aefb53b0e558625d':
Do not get device owner admin info when device owner is null
Change-Id: Iaa58b141c72bb4a419bc40fd8091dd28b239ddbc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions