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