Skip to content
Commit 360e40ef authored by Katie McCormick's avatar Katie McCormick Committed by Android Git Automerger
Browse files

am ce7c05e8: resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 

* commit 'ce7c05e8':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
parents aa0d2124 ce7c05e8
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