diff options
author | Wei Wang <weiwa@google.com> | 2014-03-20 03:32:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 03:32:17 +0000 |
commit | 15a18d07acc57d465e9d67bb28010912bb9ad15f (patch) | |
tree | 0a32cc43dc07752fedd6f8d5f7021f4a6832e2ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d (diff) | |
parent | da084104eb768f4472b7988b77a4f2b7e3f170d8 (diff) |
am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit 'da084104eb768f4472b7988b77a4f2b7e3f170d8':
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