tree 7858b01617b42b8048ea60ea9cbe23bce0ac2037
parent fa055b3b0f66d8c2ca237fc411c61fa1d54a524e
parent f0efc70a9932c5004f2bc32efbdefb91ef352ac5
author Chen Xu <fionaxu@google.com> 1572945374 -0800
committer android-build-merger <android-build-merger@google.com> 1572945374 -0800

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

Change-Id: I2448bbe668dbe062930b2d19153a2678ee09b21b