summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-06-15 15:23:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-15 15:23:55 -0700
commit3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28 (patch)
treed8e5a430ef576072fe8f2be7ca5f9d2bacea8dae /libs/rs/rsScript.cpp
parent56b64c75c3809c55c2053f77802344a9e035343f (diff)
parent9a5fcd1c14dcea951099433885ed3519dee90f48 (diff)
am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp * commit '9a5fcd1c14dcea951099433885ed3519dee90f48': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions