diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-07-09 10:57:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 10:57:27 +0000 |
| commit | 2dd56526a6a8447c694bb5540e01cc350664926b (patch) | |
| tree | 1fd8ed90471a3849243f5c2ba89607f772c6a363 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a11c2f8f6cd5e337746926282b73ca7fa3c4eee5 (diff) | |
| parent | f6db3a2f311f7f188b66e0b41b0fc6d1df49cba1 (diff) | |
am f6db3a2f: am f25062d4: am 084a716d: am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev
* commit 'f6db3a2f311f7f188b66e0b41b0fc6d1df49cba1':
Mute correct user from device policy manager.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions