tree ee598262151ff9d372c43882bfeced8ab5bd2ea4
parent 708f9982e7f9ba69a17d4bd5320cf56692fd8df2
parent 4625edd007e7f6270469e127698c6eb892024696
author Santos Cordon <santoscordon@google.com> 1418084617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418084617 +0000

am 4625edd0: am 9d29ded2: Merge "(Telecom-system part 2) Move telecom intialization from application to service." into lmp-mr1-dev

* commit '4625edd007e7f6270469e127698c6eb892024696':
  (Telecom-system part 2) Move telecom intialization from application to service.