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