tree f4d901d22f470e7d421cde73033da6a191f7db17
parent 06286aac080afc65f1ec1539c5258b88f71c276f
parent b22079f7f96d08141f1ed3e49196b1b992b9fc84
author Xavier Ducrohet <xav@google.com> 1266025948 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266025948 -0800

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