[automerger skipped] Merge "move short code definitions to SmsManager Test API" am: b6399511f8 am: 05a10d2f89 -s ours
am:c5f71b6a01-s ours am skip reason: change_id I6a5ba2439713105b25913ba8eb081abfaafd1a2e with SHA19c7fad9235is in history Change-Id: I215e58e391b17aeb6d2d5dd929a6444d3984ca40
This commit is contained in: