am 93f63172: am 4aa53b43: am 457f6d03: Merge "Do NOT delete com.android.server.telecom for Device Owners." into lmp-mr1-dev

* commit '93f6317274da2298918a5426d482faebff55498b':
  Do NOT delete com.android.server.telecom for Device Owners.
tree: 2e656dadd7dbd6589ef7a89f586e836a77a07094
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml