OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0d2822 ba35dd1)
am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 22:21:27 +0000 (22:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:21:27 +0000 (22:21 +0000)
* commit 'ba35dd1bf70e74987e9d167961e747357574a264':
  Import translations. DO NOT MERGE


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