diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-31 17:47:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 17:47:49 +0000 |
| commit | b2731df639dadb726d6d13569d4844300d750b75 (patch) | |
| tree | 2b7efe47d069f52c043231038783ab6dcf732e80 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95057570aa3605942b3697364c9cae5eb843d1fb (diff) | |
| parent | d6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6 (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
am: d6f9056ff8
* commit 'd6f9056ff8c7c2c32ca04ef8ad2aca9d4036d3c6':
Change-Id: I440afb7323cc2730d12918fa8e78457832a89038
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions