Merge "new telephony annotation class"
am: 7a16b069fa

Change-Id: I69ac91939ed434dbb68c6c5c53426855822a56a4
tree: daba06f3b71c1ec512b69d6090920251c501aa13
  1. service/
  2. PREUPLOAD.cfg