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:
f53f9c6
4ddcb75
)
am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do...
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 11 Mar 2013 19:41:50 +0000
(12:41 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:50 +0000
(12:41 -0700)
* commit '
4ddcb75861cfb2835fcc20f2071222d2f55450ba
':
Trivial merge