summaryrefslogtreecommitdiff
path: root/libs/rs
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2010-05-12 12:15:35 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-12 12:15:35 -0700
commit1b7e3ef417f236c333c7528e7af5485fc4da664b (patch)
tree6416e431f8b723833df2f6e796c1f806fb5d0954 /libs/rs
parentf41bc1200354b20aef91e5266035cf91069d69a5 (diff)
parent55bef14f153c1a80006de2ff86bcf67984a6e1a8 (diff)
am 55bef14f: am fb234bbe: merge from open-source master
Diffstat (limited to 'libs/rs')
0 files changed, 0 insertions, 0 deletions