diff options
author | Xavier Ducrohet <xav@google.com> | 2010-02-12 17:52:28 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-12 17:52:28 -0800 |
commit | ddcf25ea7e1b21b908da73000630c72d6fa146b4 (patch) | |
tree | 806eef7811aef6c092e269ce6c1c7081704962e9 /libs/rs/rsg_ScriptJavaClass.cpp | |
parent | de7b14f9ab3df84bcb6af0775e96cab02648cbd9 (diff) | |
parent | 2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a (diff) |
am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp
* commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions