[automerger skipped] Merge "new telephony annotation class" am: 7a16b069fa am: f0efc70a99
am: d0499521e9 -s ours
am skip reason: change_id I8f4374bbe2f81b9a688c5c3699bafe4942859a1b with SHA1 21fb5e91ab is in history

Change-Id: I909745c9386b9b1dd96b5bbbf1e3a5089a3683fe
tree: 74646f56f9d628891a6823f00db4aed124b33ca9
  1. service/
  2. PREUPLOAD.cfg