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:
ba0f2a3
4161328
)
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into...
author
Xia Wang
<xiaw@google.com>
Thu, 10 Mar 2011 23:57:27 +0000
(15:57 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 10 Mar 2011 23:57:27 +0000
(15:57 -0800)
* commit '
cf994cc57df33121cea7a0082c8ea55ca125279c
':
Add WifiStressTest to Wi-Fi only test suite.
Trivial merge