summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Tsu Chiang Chuang <tsu@google.com> 2012-02-13 14:39:48 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-13 14:39:48 -0800
commit8885596a9109794ebd61e6a91e5199aa1750ed8c (patch)
tree3643c0ac51c24791ff4c3e063496b0a39cb5647b /libs/rs/rsProgram.cpp
parent84affb8ae6477c46c75f834b73daa13b2a751c21 (diff)
parent3ded587cc199d4ba592e675dc47fb80a28d1dacd (diff)
am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions