| commit | 77bce1840076082f5e4baea3eb6845f48fc84a8d | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Aug 27 14:11:46 2015 -0700 |
| committer | Roshan Pius <rpius@google.com> | Thu Aug 27 21:13:46 2015 +0000 |
| tree | 484d72b9fe597cb0e4e63559df3f68cb72bb6439 | |
| parent | fc9a8c4c4551a38729ac627a298a62a06d1feefa [diff] | |
| parent | 0810e9c8f5baf2da4aecd872ec3f43ace5d850cb [diff] |
resolved conflicts for merge of 7b5df2ab to master This method has been removed from master since we're now using API PhoneUtils from Telephony instead of this one. Change-Id: I3532078089b519a48df25e70c0a6f2584d45e3ea