diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-05-24 15:30:19 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-24 15:30:19 -0700 |
commit | 6b23af099ae607dfde0ba6438e5f9e9c775ce9ab (patch) | |
tree | c7e8898db87b579fed03406906f7e53f0e013ccc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4f057ffa2a9bed82d97c1889dc95d6b2bed8ff8d (diff) | |
parent | d607b9c725d8a080842e5969b2d6001249ad88cd (diff) |
am d607b9c7: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'd607b9c725d8a080842e5969b2d6001249ad88cd':
Use the old interface when resetting connections
Fix account filtering for specific package name
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions