tree 2ef3ef9b20be9f37441409362e548fda71d24286
parent b485ee50a14c1b7838bedaae37dc7857d9f30869
parent 6ac19321a74b6173ef7e9a57ae11ad6dfdfcc0d9
author Jordan Liu <jminjie@google.com> 1574378291 -0800
committer android-build-merger <android-build-merger@google.com> 1574378291 -0800

[automerger skipped] Merge "Expose SmsCbLocation and SmsCbMessage constructors" am: d87727f7d9 am: 850525ffaf
am: 6ac19321a7 -s ours
am skip reason: change_id Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1 with SHA1 0d76fbd0d9 is in history

Change-Id: I386558973299ca0998fd8bd214828e00a9935135