diff options
author | David Christie <dnchrist@google.com> | 2014-01-13 12:36:49 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-13 12:36:49 -0800 |
commit | 45aaa377c5d090003c6cf5fb54fff856a0807c4f (patch) | |
tree | 88932fed46ea0ca54dc3e2b030d4435a1317801e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 776b3956a9742b868b037dffd2b24c17b2dfa0e6 (diff) | |
parent | a1b89310d58df14570f7f6f5abb677c976c63a7a (diff) |
am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions