diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-24 04:04:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 04:04:41 +0000 |
| commit | 6045865d0203ce89707f94f6a478666d4c98f9af (patch) | |
| tree | 4ca22196196b5f773ffe93e548ee5590632611d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1643493e97c8904d3215c66bcd15985e72631e69 (diff) | |
| parent | 5be1cdea1c3ba40edc3e85d66e86370a56726d06 (diff) | |
am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '5be1cdea1c3ba40edc3e85d66e86370a56726d06':
RingtoneManager: query results depend on caller permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions