]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11afe4e 333e064)
am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used...
authorDan Morrill <morrildl@google.com>
Fri, 15 Oct 2010 15:33:00 +0000 (08:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Oct 2010 15:33:00 +0000 (08:33 -0700)
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

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

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

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