summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-14 15:15:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-14 15:15:36 -0700
commitaa8da3dc405dca80c6aff71a7c17f883edea2814 (patch)
tree6756be0a6d844ab2fd8afb3c8427012165f41896 /libs/rs
parent3e4fd9ea19c16050ef78ea55138a114798033f65 (diff)
parenta8e0f75b7fe99dd6672bfc958734f4558905c3aa (diff)
downloadframeworks_base-aa8da3dc405dca80c6aff71a7c17f883edea2814.zip
frameworks_base-aa8da3dc405dca80c6aff71a7c17f883edea2814.tar.gz
frameworks_base-aa8da3dc405dca80c6aff71a7c17f883edea2814.tar.bz2
am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master
Diffstat (limited to 'libs/rs')
0 files changed, 0 insertions, 0 deletions