OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
053f549
3e01b48
)
am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_api...
author
Raphael
<raphael@google.com>
Fri, 4 Feb 2011 23:20:36 +0000
(15:20 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 4 Feb 2011 23:20:36 +0000
(15:20 -0800)
* commit '
3e01b483708d0fc3766fa4adff2ae8b354de75dc
':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Trivial merge