OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ede6fa4 0a83748)
am 0a837485: am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Fri, 3 Aug 2012 21:44:07 +0000 (14:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Aug 2012 21:44:07 +0000 (14:44 -0700)
* commit '0a837485800aa38a2c6832c98c6dc09ee22c9047':
  Import translations. DO NOT MERGE


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