tree 6cf19910a1e7614bdc55a763d33c8a7c0558c687
parent 823a39ef57dee41325205e43e687fe3bb80f7012
parent f2c37bf718df8360e9a91c58d8f639991680266b
author Nancy Chen <nancychen@google.com> 1431530524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431530524 +0000

am f2c37bf7: Merge "When dial *#06# javacrash happens."

* commit 'f2c37bf718df8360e9a91c58d8f639991680266b':
  When dial *#06# javacrash happens.