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:
5b47c5c
4ea5d65
f9218b8
)
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 31 Oct 2012 16:16:58 +0000
(09:16 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Wed, 31 Oct 2012 16:16:58 +0000
(09:16 -0700)
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d
Trivial merge