diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-23 19:20:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:20:22 +0000 |
| commit | 09c4eaf71e6ec750db5b7d810bfa9643196ed968 (patch) | |
| tree | 5d7f9447ce4ed1d0e72b74c3788f3e806877ac1c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8ac962a778f64bdd07e938d4e993f48615d3bc9e (diff) | |
| parent | 7f9e9012f4bbcdd880e16212be9d90b50607c74d (diff) | |
am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '7f9e9012f4bbcdd880e16212be9d90b50607c74d':
RingtoneManager: query results depend on caller permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions