tree 46e7bd3331c00b23e88b23f985a0c6b99acaee97
parent f232d4e1f532d120e8176c5a50c0a294022eec75
parent 0d5eee378489cee3f69c38fb5e039441518cb7af
author Android (Google) Code Review <android-gerrit@google.com> 1247166465 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247166465 -0700

Merge change 6639 into donut

* changes:
  Restore audio settings and wifi.