tree 60380875566a80cc0f785ca953c2c651a4064788
parent b011af957303479a3ec996425e2cf975bb08e370
parent 80a0e6d56ee773778e14cbcdbfaf2ab8ed4eda73
author Jack Yu <jackyu@google.com> 1479489759 -0800
committer Jack Yu <jackyu@google.com> 1479489780 -0800

resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp

Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887