diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-14 11:39:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-14 11:39:26 -0700 |
| commit | e377032899fd7a9f88ad1313847e77c098b9f248 (patch) | |
| tree | e986fa3bbeb7581a5d64a24a3282bf230d8bfa72 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 26b327c80b8a2728e9d4d16671e03d7085c38747 (diff) | |
| parent | 864c68ea452baa0f4f298faf2155af45a9b6d60c (diff) | |
am 864c68ea: merge from froyo-plus-aosp
Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'
* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions