diff options
author | Mike Lockwood <lockwood@android.com> | 2011-03-03 11:46:51 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-03 11:46:51 -0800 |
commit | 84af86c4ddac6e8a0e267d4e6309f7d51f4b03d2 (patch) | |
tree | 3b1e4acba1125a82f38743d714c6b3e4cb947e00 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 774d6ca196652bdbb72ccfde8679568f68170d57 (diff) | |
parent | 43f0640fbf476404139eb8a196465000933da4ef (diff) |
am 43f0640f: (-s ours) am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
* commit '43f0640fbf476404139eb8a196465000933da4ef':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions