OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54ec712 bb529c2)
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
authorLorenzo Colitti <lorenzo@google.com>
Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help