tree d8d0565678a5ad22ad2c1d4ffd2e225f1ee419e3
parent 60a0ad65f4cd7dedbbd06993d107fb1b72d072c6
parent 8a9ae45015a4cabdd56b1160261d4e7cbe551014
author Android (Google) Code Review <android-gerrit@google.com> 1245913079 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1245913079 -0700

Merge change 5339 into donut

* changes:
  Fix intermittent crash related to call waiting