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:
7af7f7d
b202c1b
)
am fb9ffe02: Merge "First pass at implementing Canvas.drawPosText() in GL"
author
Romain Guy
<romainguy@google.com>
Wed, 18 Jan 2012 01:42:49 +0000
(17:42 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 18 Jan 2012 01:42:49 +0000
(17:42 -0800)
* commit '
fb9ffe02609c9c4ffca64927e72bc935cfe87768
':
First pass at implementing Canvas.drawPosText() in GL
Trivial merge