diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-02-10 13:16:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 13:16:38 +0000 |
| commit | 7dd9c237785fe3e904f0c018b517e66ef3e8b462 (patch) | |
| tree | 4cddb87d445f92dee944b24aa9edd6e5e3037cc9 /rs/java/android/renderscript/Sampler.java | |
| parent | e666350e12355f857c289aea46ee75c7d2ac1ce1 (diff) | |
| parent | 91bdc7d4bed9e98db0a8d079a993cf90538e2a66 (diff) | |
am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
Doc change: add carousel and spotlight for developer video.
Diffstat (limited to 'rs/java/android/renderscript/Sampler.java')
0 files changed, 0 insertions, 0 deletions