summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2010-12-02 13:44:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-02 13:44:54 -0800
commit5343f5a84e66cc0806d20c16b96e612e80131ac2 (patch)
treea7bb742adb907c4136222cdd058fcac407a2ec7f /services
parent806398755fdc63438b607856574e5b885ad98e6b (diff)
parent3591bebd5957a8547fc54659179a19440636e7f9 (diff)
downloadframeworks_base-5343f5a84e66cc0806d20c16b96e612e80131ac2.zip
frameworks_base-5343f5a84e66cc0806d20c16b96e612e80131ac2.tar.gz
frameworks_base-5343f5a84e66cc0806d20c16b96e612e80131ac2.tar.bz2
am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '3591bebd5957a8547fc54659179a19440636e7f9': Restore Wi-Fi configuration after the test. DO NOT MERGE
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions