tree ba141e3c4d359de5d3fb05b526ad13703ffc3155
parent 3fca571773ac0ba2f5ee7816f81c9948e04f89db
parent cdf34e02edf475ccdbdaa2b40831a322b9c6da31
author Android (Google) Code Review <android-gerrit@google.com> 1246599557 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246599557 -0700

Merge change 6146 into donut

* changes:
  Fixing 1949086 Sholes telephony crash after waking from sleep.