diff options
| author | Matthew Xie <mattx@google.com> | 2012-12-04 11:27:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-04 11:27:11 -0800 |
| commit | 5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a (patch) | |
| tree | f85a8c1bdbb1c7bafbce61bfdd60d085db2611af /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 994901ee7f096751cc593e213ea60a1cbdd9504a (diff) | |
| parent | 8b283df989f9b8b71797f9feaeb15cb012ab3190 (diff) | |
am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit '8b283df989f9b8b71797f9feaeb15cb012ab3190':
Change getName and getAddress permission to BLUETOOTH
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions