OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1808dc 699ef29)
am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)
* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
  Import translations. DO NOT MERGE


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