| commit | 29b90ae5fdca54e5438a192fa810e0e35983b1e0 | [log] [tgz] |
|---|---|---|
| author | xinhe <xinhe@google.com> | Wed Nov 19 22:55:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 22:55:37 2014 +0000 |
| tree | 570895648da8e9b2cf520cbd3699211c1bbe4245 | |
| parent | 61f4f685719b14f14479ebb6e7234ad30d320a7a [diff] | |
| parent | 77bfacc6fe0816e97be3a0f9a824759629d1f9eb [diff] |
am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev * commit '77bfacc6fe0816e97be3a0f9a824759629d1f9eb': Add configuration to control converting sms destination number