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