OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35d2cf1 ad36aa0)
am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d...
authorGeoff Mendal <mendal@google.com>
Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)
* commit 'ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
  Import translations. DO NOT MERGE


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