OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 878faf0 e3e4bd7)
am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f...
authorGeoff Mendal <mendal@google.com>
Wed, 14 Oct 2015 12:43:15 +0000 (12:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2015 12:43:15 +0000 (12:43 +0000)
* commit 'e3e4bd7f32c30fa131fb84142a9c1cd05771750e':
  Import translations. DO NOT MERGE


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