OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0ecaee b4ff026)
am b4ff0269: (-s ours) am 3b08bdec: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 17 Dec 2014 14:31:17 +0000 (14:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Dec 2014 14:31:17 +0000 (14:31 +0000)
* commit 'b4ff026930c1578cb8d6644a40169946758b70ce':
  Import translations. DO NOT MERGE


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