| commit | cba59432ba25f1a2efccc1e878eae59a35ddc074 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Fri Nov 18 09:22:39 2016 -0800 |
| committer | Jack Yu <jackyu@google.com> | Fri Nov 18 09:23:00 2016 -0800 |
| tree | 60380875566a80cc0f785ca953c2c651a4064788 | |
| parent | b011af957303479a3ec996425e2cf975bb08e370 [diff] | |
| parent | 80a0e6d56ee773778e14cbcdbfaf2ab8ed4eda73 [diff] |
resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp Test: telephony unit tests Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887