diff options
author | Robert Greenwalt <robdroid@android.com> | 2012-01-12 09:29:30 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-12 09:29:30 -0800 |
commit | cc9858049ddea5a28cbd1d6ee59dd814e21ef512 (patch) | |
tree | 78081fb7ae61805343c8b8cb732e5f6cb6d456c3 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 140d0158c46c580c45f88f9b880906d517c4e96e (diff) | |
parent | 1800ccfa647cca6e9c051759312d6af12f134f5a (diff) |
am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions