diff options
author | Matthew Xie <mattx@google.com> | 2013-10-21 16:05:26 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-21 16:05:26 -0700 |
commit | 9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c (patch) | |
tree | 120bd711eaadb693ac7cb3b6f76897ff253374ac /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3e33d5a769885dcd7f19f386f165810881e22c16 (diff) | |
parent | ce39e8ced8bcbc6663d420bea66280f8b438e027 (diff) |
am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027':
Change pairing api/intent permission from PRIVILEGED to ADMIN
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions