OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea51586 9caddc8)
am 2842ca8a: am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed.
authorTeng-Hui Zhu <ztenghui@google.com>
Sat, 1 Oct 2011 19:05:59 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Oct 2011 19:05:59 +0000 (12:05 -0700)
* commit '2842ca8ac63ad5e7b6a6eb89285d14db424c2bab':
  Compiling issue fix since SurfTex header changed.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help