OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a059fc7 c5657b0)
am c5657b0c: am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
authorAndreas Gampe <agampe@google.com>
Wed, 12 Nov 2014 19:12:59 +0000 (19:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Nov 2014 19:12:59 +0000 (19:12 +0000)
* commit 'c5657b0c344b39d794c4c8241004d4e19341c096':
  Frameworks/native: Add pragmas to glgen headers


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