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


Trivial merge