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:
4a07dc8
1738d4f
)
am 1738d4fc: am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."
author
Igor Murashkin
<iam@google.com>
Tue, 4 Mar 2014 22:35:04 +0000
(22:35 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 4 Mar 2014 22:35:04 +0000
(22:35 +0000)
* commit '
1738d4fca78b7678d09d5c8898e1f80fa63b4a6d
':
gui: Fix return code assert in CpuConsumer_test.
Trivial merge