OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
711785f
61719a8
)
resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
author
Sanket Padawe
<sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000
(20:19 -0700)
committer
Sanket Padawe
<sanketpadawe@google.com>
Fri, 10 Oct 2014 03:19:59 +0000
(20:19 -0700)
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
Trivial merge