OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3289c4 dd00090)
am dd000905: am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile...
authorColin Cross <ccross@android.com>
Sat, 25 Jan 2014 00:50:21 +0000 (00:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Jan 2014 00:50:21 +0000 (00:50 +0000)
* commit 'dd00090530340de22ca60f79446b5fe3050cd95f':
  libGLES_android: fix 64-bit compile errors


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