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:
85b8fb5
aee1d0a
)
Reconcile with jb-mr2-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000
(09:49 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:05 +0000
(09:49 -0700)
Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07
Trivial merge