]> git.saurik.com Git - android/aapt.git/commitdiff
am 37cedce1: Merge "Add an aapt option to allow string variations for different devic...
authorEric Fischer <enf@google.com>
Thu, 23 Sep 2010 20:49:44 +0000 (13:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Sep 2010 20:49:44 +0000 (13:49 -0700)
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp

* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
  Add an aapt option to allow string variations for different devices.


Trivial merge