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:
04f4e77
be7ca98
)
am be7ca98a: reovle conflicts for cc089099
author
shared_user android-merger-prebuild
<android-merger@google.com>
Tue, 18 Jan 2011 16:24:17 +0000
(08:24 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Jan 2011 16:24:17 +0000
(08:24 -0800)
* commit '
be7ca98a86a6fc6de822a410c3234fbccd67fd0c
':
update sdk template... thought this was merged already, but also re-add section for offline preview
Trivial merge