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

Browse Source

automerge: 29b90ae  -s ours

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

...

This commit is contained in:

xinhe

2014-11-20 21:07:07 +00:00

committed by android-build-merger

parent 4adb8d496d 29b90ae5fd

commit e013f5eace

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