Commit f0db2233 authored Jan 29, 2015 by Junda Liu Committed by Android Git Automerger Jan 29, 2015

Merge branch 'lmp-mr1-ub-dev' of...

Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/opt/telephony into lmp-mr1-ub-dev

There are no changes