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:
00aea5c
70421f3
)
Reconcile with jb-mr2-zeroday-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:20 +0000
(09:33 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:20 +0000
(09:33 -0700)
Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c
Trivial merge