OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 134ed71 967c000)
am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours
authorGeoff Mendal <mendal@google.com>
Mon, 27 Oct 2014 21:36:10 +0000 (21:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Oct 2014 21:36:10 +0000 (21:36 +0000)
automerge: 967c000  -s ours

* commit '967c000603e40704008a094cce3f3348acab7cf8':
  Import translations. DO NOT MERGE


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