tree 8c5c67f28ebad1beda271ed600a8081e63567f13
parent 56540936e959191255df760ddbfea6ccafcdd5a8
parent bb0a9b26cd77fe9df80900ccea34bec2cfc682ab
author Jordan Liu <jminjie@google.com> 1549329784 -0800
committer android-build-merger <android-build-merger@google.com> 1549329784 -0800

Merge "Fix log tag for SmsProviderTest" am: 657164eaa5 am: d35074ebcc
am: bb0a9b26cd

Change-Id: Ica40f088f4fc3bd041ff5cdbd9e9bb9292890a57