Skip to content
Commit c3d425fc authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

[automerger skipped] Merge "move short code definitions to SmsManager Test... 

[automerger skipped] Merge "move short code definitions to SmsManager Test API" am: b6399511 am: 05a10d2f -s ours am: c5f71b6a -s ours
am: 6a43c89d -s ours
am skip reason: change_id I6a5ba2439713105b25913ba8eb081abfaafd1a2e with SHA1 9c7fad92 is in history

Change-Id: I20ba3873576045272fc30e0769842064041333e1
parents 937e7697 6a43c89d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment