diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-06-29 13:37:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 13:37:46 +0000 |
| commit | 333847532f3fb6517daf9d41c8dbb0bca02d48a6 (patch) | |
| tree | da11aae74b00a2b59f7ba3927fa5d1ca9eea7acf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e3c6c095c69b30b8367bf9f50e337044632c1ce5 (diff) | |
| parent | 43904fd5b7ea74f21859ec94291a70529611304c (diff) | |
am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
* commit '43904fd5b7ea74f21859ec94291a70529611304c':
Revert "Deprecate APIs for admin to create users."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions