OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f21284 e6f7a8b)
am e6f7a8bf: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:34:36 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:36 +0000 (11:34 +0000)
* commit 'e6f7a8bff7fbeebdf40e46e4a210467bfe085fc2':


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