summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
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
commite06be941185e33392dde3dcaba85c67ce5423578 (patch)
tree03efa10e558920189beaed1de2c4461f713e88b7 /libs/rs/rsScript.cpp
parent615e2fa1755ea3b6b8196f783842cd394ad3beb2 (diff)
parent77880ae4187d92506848249585687fc9d0c0dd25 (diff)
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 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions