tree 63599346cdd7cc9e7a1e782740a3921cd15895b4
parent de7bbdefd359b67be0e169131ff8e5fce8eff561
parent ce1d81c697f30f2556aefa5c1a450a39a9dbe1e6
author Santos Cordon <santoscordon@google.com> 1418084618 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418084618 +0000

am ce1d81c6: am e6a33f2e: (Telecom-system part 4) Move telecom to the system server process.

* commit 'ce1d81c697f30f2556aefa5c1a450a39a9dbe1e6':
  (Telecom-system part 4) Move telecom to the system server process.