summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC.cpp
diff options
context:
space:
mode:
author Ying Wang <wangying@google.com> 2010-01-12 16:37:31 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-12 16:37:31 -0800
commitffebd7c2cc267ee0c33378e0c3b3b0ff260ba150 (patch)
treeaa19199bfc924052239a209e8ff694db0ed254cc /libs/rs/rsScriptC.cpp
parent4a4b6e0d4646a0a4bc3cfa76cb37b4c6876dedbf (diff)
parentb4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d (diff)
am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
0 files changed, 0 insertions, 0 deletions