OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adcf72a 185e172)
am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 27 Oct 2014 18:52:57 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:57 +0000 (18:52 +0000)
* commit '185e17221a54f8c201d27d291a30f01f1f7641dd':


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