OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb60fe9 e6479d5)
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
authorAlex Cheung <alexcheung@google.com>
Thu, 24 Dec 2015 01:06:20 +0000 (17:06 -0800)
committerAlex Cheung <alexcheung@google.com>
Thu, 24 Dec 2015 01:06:20 +0000 (17:06 -0800)

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