tree 7c3c4131bb3bb54ff792cad952234e7ea12ff229
parent 76eb1a251808438771a237a92a0ab0903baeea7e
parent 616f3173e08ec6110cf5766c70f84c9e031fb7d7
author Irfan Sheriff <isheriff@google.com> 1315855445 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315855445 -0700

Merge "Emergency callback mode handling"