diff options
| author | Sarah Maddox <sarahmaddox@google.com> | 2014-11-14 00:02:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 00:02:38 +0000 |
| commit | aa3a93ede76b46ef6ca0daa18ca9a6cd77c26f66 (patch) | |
| tree | bae1881ef1c616b4bcb962f915a3ccc7804fbbc2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 30aee7fccbbcbdd09ca9393636316813e222ba62 (diff) | |
| parent | 67b0ac719a87ba52c849a6cf055ef235f230dd6e (diff) | |
am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '67b0ac719a87ba52c849a6cf055ef235f230dd6e':
docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions