tree 2be6180be2c505895805cf583c10f2640c03b8af
parent a6484519451bffa0ff88dbaee3a1a3175dd876ae
author Hung-ying Tyan <tyanh@google.com> 1287606482 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287606482 -0700

Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread