Skip to content
Commit 58e805cc authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

[automerger skipped] Merge changes from topics "add-certs-cp",... 

[automerger skipped] Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32 am: 510f917b
am: 27b61580 -s ours
am skip reason: SHA1 27b61580 skipped by user hallliu

Change-Id: I2646ee95ddc238bb3f008f7e02ff0e6f18230dc9
parents b1ceaefe 27b61580
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