diff options
| author | Sarah Maddox <sarahmaddox@google.com> | 2015-01-26 20:23:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 20:23:25 +0000 |
| commit | 95226c981b4e14a900f7c4224534d370aeb1ca60 (patch) | |
| tree | 1a88dce34f28d6e26c16d4c7c1f2ad1252c1086c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d064ce7e8b4ef75c07b99d466c85ea55ef2f4163 (diff) | |
| parent | 912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a (diff) | |
am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions