OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c302e3 e7b79f1)
am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 19 Jan 2015 15:20:49 +0000 (15:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Jan 2015 15:20:49 +0000 (15:20 +0000)
* commit 'e7b79f16c1548ba2c40af4452167c64ba442566e':
  Import translations. DO NOT MERGE


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