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:
0b0c72f
eeae1de
)
am fa1a9162: Merge "Match WIFI_P2P data usage."
author
Jeff Sharkey
<jsharkey@android.com>
Tue, 24 Jan 2012 23:40:20 +0000
(15:40 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 24 Jan 2012 23:40:20 +0000
(15:40 -0800)
* commit '
fa1a91628a706bbe51d91e0ccb9144df8b8529e6
':
Match WIFI_P2P data usage.
Trivial merge