OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f00f2c e40dff3)
am e40dff3d: (-s ours) am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232...
authorGeoff Mendal <mendal@google.com>
Sat, 25 Jul 2015 16:37:15 +0000 (16:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Jul 2015 16:37:15 +0000 (16:37 +0000)
* commit 'e40dff3d186f1000c560fb3ffc169dd2631c8642':
  Import translations. DO NOT MERGE


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