]> git.saurik.com Git - android/aapt.git/commitdiff
am 684a2edb: Merge change 3577 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Jun 2009 22:32:56 +0000 (15:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jun 2009 22:32:56 +0000 (15:32 -0700)
Merge commit '684a2edbe192a2a76684c5d6855773196d2e1a2e'

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


Trivial merge