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:
227d45e
9f63d6f
)
Reconcile with nakasi-factoryrom-release
author
The Android Open Source Project
<initial-contribution@android.com>
Tue, 29 May 2012 16:41:02 +0000
(09:41 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Tue, 29 May 2012 16:41:02 +0000
(09:41 -0700)
Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
Trivial merge