From: Android (Google) Code Review <android-gerrit@google.com>
Date: Wed, 10 Jun 2009 22:32:56 +0000 (-0700)
Subject: am 684a2edb: Merge change 3577 into donut
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/0b27d12badbf3afbd1890fbdc1bc05243c9dfde3?ds=inline

am 684a2edb: Merge change 3577 into donut

Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'

* commit '684a2edbe192a2a76684c5d6855773196d2e1a2e':
  Make aapt Error out when an overlay adds a string.
---

0b27d12badbf3afbd1890fbdc1bc05243c9dfde3