OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06bb856 74d8ac2)
am 74d8ac2e: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:31:14 +0000 (11:31 +0000)
* commit '74d8ac2e274f0a19f5164191e8dd00dd8e741428':


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