tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 40eda4e7cd266da897359ae78fc8a63bef4a2050
parent 3e7026b93f5e384072885a95e2d8103fbf8d400b
author Nicolas Prevot <nprevot@google.com> 1426893232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893232 +0000

am 3e7026b9: am 4e4c48fc: am d2d33bd3: Merge "Deleting com.android.telecom in a managed profile." into lmp-dev

* commit '3e7026b93f5e384072885a95e2d8103fbf8d400b':