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