diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-06-22 16:10:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 16:10:07 +0000 |
| commit | 57f605f82b6ebf87bd9e7f2def4a082ab06a4556 (patch) | |
| tree | 98219a9b237abb3bc08c0e21145f06f29d811d97 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 87c5a5088e555fb3bbd5f28f1eb85a0596d36250 (diff) | |
| parent | a136f8d7922a7538942f4e0962af09d87d920e6d (diff) | |
am a136f8d7: am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
* commit 'a136f8d7922a7538942f4e0962af09d87d920e6d':
New internal permission to protect apps against rogue Nfc message.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions