tree 96359f9e3d1240126d1cf1cd3d08ab5020e486b5
parent 3c4ba7375c7774823b1cf5b9791337342d0e1400
parent ccf305e76fc9435f72927148b329c5ee6387a1c6
author Jack Yu <jackyu@google.com> 1574298387 -0800
committer android-build-merger <android-build-merger@google.com> 1574298387 -0800

Merge "telephony annotations part 2" am: 1a9f2d0e78
am: ccf305e76f

Change-Id: Ib08af42a04289f0cf6bc8987341afdfe02c5b7a6