| commit | e013f5eace84c3847a89fbbb1869a9d0d54b6f7e | [log] [tgz] |
|---|---|---|
| author | xinhe <xinhe@google.com> | Thu Nov 20 21:07:07 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 20 21:07:07 2014 +0000 |
| tree | 84f64a5a0257c0ec72011e721e711c55b589a0de | |
| parent | 4adb8d496d14cdad83eed0a6972eade7979250ff [diff] | |
| parent | 29b90ae5fdca54e5438a192fa810e0e35983b1e0 [diff] |
am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev automerge: 29b90ae -s ours * commit '29b90ae5fdca54e5438a192fa810e0e35983b1e0': Add configuration to control converting sms destination number