tree 7a6e70ee922b710630caa6a83a32fd0849d44b54
parent d1c0e074c03555719ebbda157043ea977daf363d
parent 03307979292ee623f9180f6bc49e5f64a009b79a
author Meng Wang <mewan@google.com> 1576801164 -0800
committer android-build-merger <android-build-merger@google.com> 1576801164 -0800

Merge "Do not setSubId on SmsMessage."
am: 0330797929

Change-Id: I7b7eb6c747ce7e9f82f0125519a6bc2fafaa3ef2