diff options
author | Chung-yih Wang <cywang@google.com> | 2010-05-14 23:18:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 23:18:31 -0700 |
commit | 533844d9688f7c9269372f97db17c9bc4d19c04b (patch) | |
tree | 1d8ca11be0518ef363f76120687b369bcabdb452 /graphics/java/android/renderscript/ScriptC.java | |
parent | e0a19573d7febe5ecde465f7206d54c37cece916 (diff) | |
parent | c7388e3541c9f1d64dd13fc2de49ff77d8993fa5 (diff) |
am c7388e35: am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5' into kraken
* commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5':
Make the SSID field of WifiConfiguration consistent with API description.
Diffstat (limited to 'graphics/java/android/renderscript/ScriptC.java')
0 files changed, 0 insertions, 0 deletions