diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-08 02:11:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 02:11:17 +0000 |
| commit | 1062080cd323c14d5bd24fb308da9431a0d250e5 (patch) | |
| tree | 5bfa7c7379d56fa6ae93c5f54ffe8643b6112f43 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c4a6df22649378631c4e541ed81c5848735427dd (diff) | |
| parent | 0ea81eed882d288c9473e377639b0b88280fd044 (diff) | |
am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit '0ea81eed882d288c9473e377639b0b88280fd044':
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