OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4d1588 2f0ef73)
am 2f0ef73c: (-s ours) am 1435018e: (-s ours) am b87bbcfb: (-s ours) am bbd70391...
authorGeoff Mendal <mendal@google.com>
Sat, 1 Aug 2015 17:52:31 +0000 (17:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Aug 2015 17:52:31 +0000 (17:52 +0000)
* commit '2f0ef73c31f0412eedc7613d4c6113ade3ee6a7e':
  Import translations. DO NOT MERGE


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