summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2010-05-12 14:41:40 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 14:41:40 -0700
commit2a2174a7bdd7a557d3e17b78876b6887a02ebf80 (patch)
tree69ec59de282834be17b1795b2f7b1389acfc75b3 /libs/rs/rsProgram.cpp
parent72a6af1ab13fbcb98598b0e11b0bb3b069d30635 (diff)
parentccfd99b1e2a64c72ec433ebf5cf98d644ab24614 (diff)
am ccfd99b1: merge from open-source master
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken * commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614': Support for User to User Signaling (UUS)
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions