OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3331e42 c30ada1)
am c30ada16: (-s ours) am d0aa60ed: (-s ours) am 23127a61: (-s ours) am 41abf663...
authorGeoff Mendal <mendal@google.com>
Mon, 10 Aug 2015 14:31:52 +0000 (14:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Aug 2015 14:31:52 +0000 (14:31 +0000)
* commit 'c30ada16af2d7d4494f8bb013a9bd9cfdc9c617d':
  Import translations. DO NOT MERGE


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