diff options
author | Wink Saville <wink@google.com> | 2011-04-07 14:31:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 14:31:20 -0700 |
commit | 097786507b07ff7137b305b5cf71b5ecbc6b029e (patch) | |
tree | 2890404c983d9b9cce91dcbed7a1f561708ecc24 /graphics/java/android/renderscript/Sampler.java | |
parent | 825e28c6c5c312c08f44b71400f987b6bd66e103 (diff) | |
parent | de1b950d2b07737e3d284ed2ada361737d8a5a1a (diff) | |
download | frameworks_base-097786507b07ff7137b305b5cf71b5ecbc6b029e.zip frameworks_base-097786507b07ff7137b305b5cf71b5ecbc6b029e.tar.gz frameworks_base-097786507b07ff7137b305b5cf71b5ecbc6b029e.tar.bz2 |
am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
ConnectivityService needs to use the new names for the NetConfig vars.
Diffstat (limited to 'graphics/java/android/renderscript/Sampler.java')
0 files changed, 0 insertions, 0 deletions