tree 8417e86ecd33f052ea30e653b61147330c60ea80
parent b63e4ea685a53a2000f74e4f5ed7f26d3fd8e4c7
parent d1e5e3ffc22478bad8525dec4f1c6d57fe0ad368
author Android (Google) Code Review <android-gerrit@google.com> 1247169221 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1247169221 -0700

am d1e5e3ff: Merge change 6639 into donut

Merge commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368'

* commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368':
  Restore audio settings and wifi.