am e013f5ea: (-s ours) am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev automerge: 29b90ae -s ours

Browse Source

* commit 'e013f5eace84c3847a89fbbb1869a9d0d54b6f7e':
  Add configuration to control converting sms destination number

...

This commit is contained in:

xinhe

2014-11-20 21:13:30 +00:00

committed by Android Git Automerger

parent 00c9de816a e013f5eace

commit 1886e5e01f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available