Merge "new telephony annotation class" am: 7a16b069fa
am: f0efc70a99

Change-Id: I2448bbe668dbe062930b2d19153a2678ee09b21b
tree: 7858b01617b42b8048ea60ea9cbe23bce0ac2037
  1. service/
  2. PREUPLOAD.cfg