summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramFragment.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-06-15 15:49:05 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-15 15:49:05 -0700
commit6b56a84ace800811aec7e42e70bb3bfd8f6e809e (patch)
treedbfedb48619d70550fee3b8abed7ac2c77e8d16b /libs/rs/rsProgramFragment.cpp
parentafcc0f88741b336fe5f3cb26c2eb5b30447ecfa3 (diff)
parent3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28 (diff)
am 3d6ea3bd: 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 '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28' * commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28': 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/rsProgramFragment.cpp')
0 files changed, 0 insertions, 0 deletions