diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-24 03:08:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:08:09 +0000 |
| commit | 2ea3687786fc7505b475a461b645be1074fbbef5 (patch) | |
| tree | bc855025e741e7fda9ba8bacd4c8f9e458d642b6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e0dc239420907d48c5f0d63bccfec3b7dcee3135 (diff) | |
| parent | 09c4eaf71e6ec750db5b7d810bfa9643196ed968 (diff) | |
am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '09c4eaf71e6ec750db5b7d810bfa9643196ed968':
RingtoneManager: query results depend on caller permission
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions