Merge "Do NOT delete com.android.server.telecom for Device Owners." into lmp-mr1-dev
tree: 2e656dadd7dbd6589ef7a89f586e836a77a07094
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml