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