]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1117853 1f18df6)
am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps...
authorDan Morrill <morrildl@google.com>
Wed, 13 Oct 2010 22:23:27 +0000 (15:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Oct 2010 22:23:27 +0000 (15:23 -0700)
Merge commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp

* commit '5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify


Trivial merge
mirror of aapt