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:
b3bcc46
08da0bf
)
Reconcile with jb-mr1-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000
(15:03 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:17 +0000
(15:03 -0700)
Change-Id: I198408ef678851f19476836b10a2fc002dd11a95
Trivial merge