OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a3ccd1 620a5bd)
am 620a5bd0: (-s ours) am 51aedf86: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Jan 2015 14:34:44 +0000 (14:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 14:34:44 +0000 (14:34 +0000)
* commit '620a5bd077c7077058f460af5025ad7d2cd94758':
  Import translations. DO NOT MERGE


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