diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-08 11:02:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 11:02:13 +0000 |
| commit | 6f91cedfeba3accca5e627093b8958428d3a4edb (patch) | |
| tree | 00888f18d44e2979ed306ec884d250e83f54a465 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 4234344af6d0f1b749d4a3f9c4e06b17aceb2995 (diff) | |
| parent | c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a (diff) | |
am c9d49ff0: (-s ours) am e3318add: 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 'c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions