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:
54d97c8
439b197
)
Reconcile with jb-mr2-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000
(17:13 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:32 +0000
(17:13 -0700)
Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01
Trivial merge