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:
6de9653
1160e89
)
am 1160e89d: am d171da97: GLConsumer: Add query for current frame number.
author
Eino-Ville Talvala
<etalvala@google.com>
Fri, 20 Sep 2013 18:19:41 +0000
(11:19 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 20 Sep 2013 18:19:41 +0000
(11:19 -0700)
* commit '
1160e89d31810f2ba66f8ab502281579115b39b0
':
GLConsumer: Add query for current frame number.
Trivial merge