tree fe7a79fcb7ea7c5a9420d9cf14e6a5b140d86f19
parent 6a13b9492b870797cdf7217833b4cec176272fc1
parent 9973c5bbf01260b0ecb3cecf2d6068f6e94026f7
author Allen Su <allenwtsu@google.com> 1605752764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605752764 +0000

Merge "Declare new SMS error code in SmsManager" am: ea337540f0 am: b670c62130 am: 9973c5bbf0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495901

Change-Id: Id20f014a1516cff68cb743ac9fa45dc7de16ae56