OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
40f2023
42b04e4
)
Reconcile with jb-mr2-zeroday-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 21 Jun 2013 00:31:59 +0000
(17:31 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 21 Jun 2013 00:31:59 +0000
(17:31 -0700)
Change-Id: I179642d15ce613dac101897cadf2c63ca60c5a11
Trivial merge