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:
9ac559b
101670c
)
Reconcile with jb-mr2-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000
(07:14 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:48 +0000
(07:14 -0700)
Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d
Trivial merge