]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2dcfc7 1f340ea)
am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for...
authorEric Fischer <enf@google.com>
Thu, 23 Sep 2010 20:52:00 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Sep 2010 20:52:00 +0000 (13:52 -0700)
Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7'

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

1  2 
ResourceTable.cpp patch | diff1 | diff2 | blob | history

diff --cc ResourceTable.cpp
Simple merge
mirror of aapt