OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32e40e7 bd74dff)
am bd74dff8: (-s ours) am a377ea1c: (-s ours) am 130fc5ca: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Mar 2015 14:26:10 +0000 (14:26 +0000)
* commit 'bd74dff8b451a7099beb6cacc54f1062d58b5054':
  Import translations. DO NOT MERGE


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