diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-01 01:24:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-01 01:24:49 +0000 |
| commit | 3f69719a1b8f654a2b59fbea28fbca0fbad08bc1 (patch) | |
| tree | 714091a5c3f15bace8422419cd4c7866eb59d85f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b400938058c243d38319aa0f410c15e3d9182a28 (diff) | |
| parent | ce3b66f542947211ed8ea7e09267bb66ff687a34 (diff) | |
am ce3b66f5: am aadc90b5: am 67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev
* commit 'ce3b66f542947211ed8ea7e09267bb66ff687a34':
Rename uses-permission-m to uses-permission-23
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions