OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e183ac e3d8faa)
am e3d8faa5: (-s ours) am 4f7f05a0: (-s ours) am ad36aa0e: (-s ours) am 3963b980...
authorGeoff Mendal <mendal@google.com>
Wed, 7 Oct 2015 13:13:34 +0000 (13:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Oct 2015 13:13:34 +0000 (13:13 +0000)
* commit 'e3d8faa5ba76f79b112dd8925189455e878e3a66':
  Import translations. DO NOT MERGE


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