diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-20 14:03:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-20 14:03:54 -0700 |
| commit | bdc15d8b43e7763bf72780d0f683b223b8cf6625 (patch) | |
| tree | 337545b286bc32c108559e986ce2b8778525e34e /drm/common/DrmInfo.cpp | |
| parent | 940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8 (diff) | |
| parent | 4056ab97be6224dcc00ac70843544790f2d65fb7 (diff) | |
| download | frameworks_base-bdc15d8b43e7763bf72780d0f683b223b8cf6625.zip frameworks_base-bdc15d8b43e7763bf72780d0f683b223b8cf6625.tar.gz frameworks_base-bdc15d8b43e7763bf72780d0f683b223b8cf6625.tar.bz2 | |
am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp
* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
Add permission requirements to SipAudioCall and SipManager javadoc.
Diffstat (limited to 'drm/common/DrmInfo.cpp')
0 files changed, 0 insertions, 0 deletions