tree 3ccb79e9fb15fceadf18227f4961fbf78daea1e0
parent 4ad916ec4a34d18ab6ad35f1fbfb7a73de30ba24
parent 565e33c6080fc6867ccb53ab740d1f17e6b77280
author Ihab Awad <ihab@google.com> 1417451377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417451377 +0000

am 565e33c6: Merge "Telecom API updates (2/6)" into lmp-mr1-dev

* commit '565e33c6080fc6867ccb53ab740d1f17e6b77280':
  Telecom API updates (2/6)