OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1303f19 f62af38)
am f62af382: (-s ours) am 5b7e25aa: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 23 Oct 2014 22:16:11 +0000 (22:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 22:16:11 +0000 (22:16 +0000)
* commit 'f62af382665f7a8c6d4968a6cb15a0cfb638c505':
  Import translations. DO NOT MERGE


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