tree 7a0d5ce82465863199b3ec3d909a35f42267bb4a
parent 84d5455efae121b77ed71fba420c7b2ea6c27123
parent d7ed2e2087359149d522f00a8229fe1ee9433167
author Evan Charlton <evanc@google.com> 1412293088 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412293088 +0000

am d7ed2e20: am 7363517f: am 25b85bcc: am 8f8bffa1: Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev

* commit 'd7ed2e2087359149d522f00a8229fe1ee9433167':
  Add @SystemApi to missing TelecomManager methods