OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77cec86
7bf5a43
)
am fa1a6eb5: am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into...
author
Jamie Gennis
<jgennis@google.com>
Fri, 18 Nov 2011 10:42:19 +0000
(
02:42
-0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 18 Nov 2011 10:42:19 +0000
(
02:42
-0800)
* commit '
fa1a6eb584dde49d424fa53a995a6d0dbd45155c
':
GLES: add image external enums
Trivial merge