tree 6c0dfff1a042bfd8cab8e6fcfed2de68ab2af55a
parent 8f281cc4bc607a7784c109d6afc2a70c268ab165
parent 0256b03e6e7d23bcee8ebd84892ee02d05e886a1
author Xavier Ducrohet <xav@google.com> 1266026117 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266026117 -0800

am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair

Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'

* commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4':
  Add --auto-add-overlay option to aapt. DO NOT MERGE