]> git.saurik.com Git - android/aapt.git/commitdiff
am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do...
authorXavier Ducrohet <xav@android.com>
Wed, 26 Sep 2012 18:06:03 +0000 (11:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 18:06:03 +0000 (11:06 -0700)
* commit '4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa':
  Fix writing text version of styleable IDs. do not merge.


Trivial merge