| commit | 40f12d98248a8b4a6a34fc43538e349bda4289ef | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Feb 13 03:59:35 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 13 03:59:35 2014 -0800 |
| tree | 25410ebf4aa407776c823a5c7295c18b5a9b4c4d | |
| parent | 78d659870fda5e2c195d2b548a1e9a018cb3afc3 [diff] | |
| parent | 005151484546fb0bf7f83c5a6ee065715230bf26 [diff] |
am 00515148: resolved conflicts for merge of 396b9e79 to master * commit '005151484546fb0bf7f83c5a6ee065715230bf26': Telephony API extension v2