OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
ca5aae2
0c1c394
)
Reconcile with jb-mr1-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:59 +0000
(08:04 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:59 +0000
(08:04 -0700)
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b
Trivial merge