tree 87be4fc25831562dccbf6518701c028511c843cf
parent ccc155ea51fde7eae6083693191832ffee7322fb
parent bd95271170dc307e17d817079f12d5b038b45685
author Cody Kesting <ckesting@google.com> 1555001926 -0700
committer android-build-merger <android-build-merger@google.com> 1555001926 -0700

Merge "Update TelMan API for testing Line1NumberForDisplay." am: d09bd9d9f6
am: bd95271170

Change-Id: I1ee422c3b23a59abccd65229804183b070d1d66f