diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-06-22 16:23:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 16:23:06 +0000 |
| commit | c71c4d56c522b9511ee7695b0a881fafb7c134d4 (patch) | |
| tree | 9f273c3a8a9bbf3ef9e46ba365d640815f3de63b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 82064fcab4f4a5b7f605037660727c5fea45a558 (diff) | |
| parent | 57f605f82b6ebf87bd9e7f2def4a082ab06a4556 (diff) | |
am 57f605f8: am a136f8d7: am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
* commit '57f605f82b6ebf87bd9e7f2def4a082ab06a4556':
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