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:
14c2d2c
bb0e59b
)
am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1
author
Bart Sears
<bsears@google.com>
Mon, 21 Nov 2011 16:31:56 +0000
(08:31 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 21 Nov 2011 16:31:56 +0000
(08:31 -0800)
* commit '
bb0e59be7c01fd9eb85d81b92c0527bac5402d1d
':
ICS MR0.1 will be version 4.0.2 - do not merge
Trivial merge