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
|
patch
| inline |
side by side
(from:
dc744b8
)
resolve merge conflicts of 3964c51bf2 to nyc-dev
author
Dmitry Dementyev
<dementyev@google.com>
Thu, 9 Mar 2017 00:32:00 +0000
(16:32 -0800)
committer
android-build-team Robot
<android-build-team-robot@google.com>
Wed, 24 May 2017 22:35:01 +0000
(22:35 +0000)
Bug:
33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit
0f04a5a93f846d6f2d528ab6ae0c9e37d701e438
)
No differences found