diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-08 02:15:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:15:08 +0000 |
| commit | e3318addc9c42a7b6d9d1ba8eaff786236b6dec0 (patch) | |
| tree | f14f56b815bcd0fb6c88c18ee986e3271df33700 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6256352364c53ce841e7635f637713a0b7677be6 (diff) | |
| parent | 1062080cd323c14d5bd24fb308da9431a0d250e5 (diff) | |
am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '1062080cd323c14d5bd24fb308da9431a0d250e5':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions