[automerger skipped] Merge "Use InboundSmsTracker#getFormat() to get message...
[automerger skipped] Merge "Use InboundSmsTracker#getFormat() to get message format simply" into qt-dev-plus-aosp
am: af498a04 -s ours
am skip reason: change_id Id05dc04e51d7c5186e9e327d9f20a8a14ddaeac1 with SHA1 f6916232 is in history
Change-Id: I631ac2b065d154895aef11ee9b0441b2364762e5