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:
bfba2df
097eaf9
)
am 097eaf90: (-s ours) Reconcile with jb-mr1.1-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 30 Nov 2012 23:01:43 +0000
(15:01 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 30 Nov 2012 23:01:43 +0000
(15:01 -0800)
* commit '
097eaf9026c0a8d02b1586a2611b5be350c1a285
':
JDP60C
Trivial merge