OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c8a2d6 eb5b772)
am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Fri, 5 Dec 2014 00:14:20 +0000 (00:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Dec 2014 00:14:20 +0000 (00:14 +0000)
* commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b':
  Import translations. DO NOT MERGE


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