summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Chung-yih Wang <cywang@google.com> 2010-10-07 21:37:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-07 21:37:09 -0700
commit77880ae4187d92506848249585687fc9d0c0dd25 (patch)
tree784547e9f30b8bfc3f3e3451b4a373a7fcb704a0 /libs/rs/rsScript.cpp
parentb77455ee290691b036ac79236a93e57ff294ef0c (diff)
parent44b7ef5408f135892fe8e8643fa4946532902672 (diff)
am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '44b7ef5408f135892fe8e8643fa4946532902672' into gingerbread-plus-aosp * commit '44b7ef5408f135892fe8e8643fa4946532902672': SipService: add permission check for using API
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions