diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2014-09-23 16:50:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 16:50:16 +0000 |
commit | 1b4f1a794dc90c1ea877af64e8340afe6146584a (patch) | |
tree | 3c7ad0a5547b66f43066d7af936e67ec9fd729b4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76 (diff) | |
parent | 1c2eaa784b2376b674cf438f42342271c8aa79a8 (diff) |
am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1c2eaa784b2376b674cf438f42342271c8aa79a8':
Change permission guard on bindBackupAgent()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions