OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77dae91 f215bff)
am f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 3 Feb 2012 23:07:00 +0000 (15:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Feb 2012 23:07:00 +0000 (15:07 -0800)
* commit 'f215bfff60aab5b9708b376eeedd033a8ad5418e':
  Import translations. DO NOT MERGE


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