From: Sanket Padawe <sanketpadawe@google.com>
Date: Tue, 6 Jan 2015 20:56:36 +0000 (+0000)
Subject: am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId... 
X-Git-Tag: android-x86-6.0-r1~671^2~80
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=310b533689ac9ecd6ee3e9abbd4029882522358f;p=android-x86%2Fpackages-apps-Settings.git

am 2c9d75a7: am be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev

* commit '2c9d75a7c379c07bf84bfc87cbe4d1a4666bfc47':
  Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
---

310b533689ac9ecd6ee3e9abbd4029882522358f