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