diff options
author | Chung-yih Wang <cywang@google.com> | 2010-10-10 14:21:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 14:21:18 -0700 |
commit | e06be941185e33392dde3dcaba85c67ce5423578 (patch) | |
tree | 03efa10e558920189beaed1de2c4461f713e88b7 /preloaded-classes | |
parent | 615e2fa1755ea3b6b8196f783842cd394ad3beb2 (diff) | |
parent | 77880ae4187d92506848249585687fc9d0c0dd25 (diff) | |
download | frameworks_base-e06be941185e33392dde3dcaba85c67ce5423578.zip frameworks_base-e06be941185e33392dde3dcaba85c67ce5423578.tar.gz frameworks_base-e06be941185e33392dde3dcaba85c67ce5423578.tar.bz2 |
am 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'
* commit '77880ae4187d92506848249585687fc9d0c0dd25':
SipService: add permission check for using API
Diffstat (limited to 'preloaded-classes')
0 files changed, 0 insertions, 0 deletions