OSDN Git Service

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)
commit41d0ebb7846e731bf277319c24540160a1d2021e
treee3d0267c2cdbcae5b5efd9404c69fe1ecaa84583
parentea5158621f78de6b9c3a6ad88c507a6b45cdfd42
parent9caddc886c31f9ebd0f7fae6e575e7c32206c38f
am 2842ca8a: am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed.

* commit '2842ca8ac63ad5e7b6a6eb89285d14db424c2bab':
  Compiling issue fix since SurfTex header changed.