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:
8b30f1e
bbe78df
)
am bbe78df1: (-s ours) am 05d14cb9: Merge "don\'t use the sdkdoc template if the...
author
Scott Main
<smain@google.com>
Mon, 24 Jan 2011 22:19:01 +0000
(14:19 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 24 Jan 2011 22:19:01 +0000
(14:19 -0800)
* commit '
bbe78df17831981200e1a906bb759492b5d5ae85
':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
Trivial merge
OSDN Git Service
