diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-20 16:33:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 16:33:40 +0000 |
| commit | 323d8ef30a7dea00f524338f119af4ddbd38db3c (patch) | |
| tree | 787f98de81ba18226dcfc032bc67ef3048cb6131 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 43f8ed565a61ecec3b73bb20bd64aac320a47fae (diff) | |
| parent | 6c9385b13cd8baec46e68c5c2bdacfc570d40b4f (diff) | |
am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '6c9385b13cd8baec46e68c5c2bdacfc570d40b4f':
DO NOT MERGE: Add status callback for start/stop advertising.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions