Merge "new telephony annotation class"
tree: aca745a4850c6dfc4061c208c30a5f72e2656097
  1. service/
  2. PREUPLOAD.cfg