]> git.saurik.com Git - android/aapt.git/commitdiff
am fb34490f: Merge "Fix writing text version of styleable IDs."
authorXavier Ducrohet <xav@android.com>
Wed, 26 Sep 2012 17:44:22 +0000 (10:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Sep 2012 17:44:22 +0000 (10:44 -0700)
* commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786':
  Fix writing text version of styleable IDs.

1  2 
Resource.cpp

diff --cc Resource.cpp
Simple merge