diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-06-22 15:57:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-22 15:57:52 +0000 |
| commit | a136f8d7922a7538942f4e0962af09d87d920e6d (patch) | |
| tree | 0d60addf7b0bfc144b4fa5705f7f52f031620860 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f1c031d512fd8596e40b8a5832441869ab831e48 (diff) | |
| parent | c54bcade1b7ec7e044aca7fe9c60357ad957a8c2 (diff) | |
am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
* commit 'c54bcade1b7ec7e044aca7fe9c60357ad957a8c2':
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