tree f86d4c6dd1985cf16d496f6d09061a6c1f0c8ca2
parent 0622a4c8b80996258bfb7a3ca4effed32fcf18d3
parent 66c11e1f8478a3f436e31e315f9bbb43d6d5f021
author Yorke Lee <yorkelee@google.com> 1402006983 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402006983 +0000

am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev

* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review