diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2012-01-24 11:42:21 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-24 11:42:21 -0800 |
commit | 67cda1a0ec2f443293d0ada7c49708ff4a11c8c7 (patch) | |
tree | c1754e9e5bbdedd3b905b3269d7d1bdd8a9ebc76 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a5853595165a6395ca41bbc17a3dd88e12259ad1 (diff) | |
parent | f449ea9e96162698f4ec6d62c70750eb50744da7 (diff) |
am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7':
Use the carrier-given dns addrs for tethering.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions