OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b5fe96b
7bd5a76
)
am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 7 Dec 2012 15:56:46 +0000
(07:56 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 7 Dec 2012 15:56:46 +0000
(07:56 -0800)
* commit '
7bd5a76e2e89ca6d172539ef2dfa43f42f07c001
':
Trivial merge