OSDN Git Service

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)
commitce821387ba6b6745a99c2a3231a5c0b2e42a34fc
tree65b28301e09d88b6ae8255b5999db2c6c2793687
parentf1808dcafc45fea92e27b5300f4d6cc742bb3105
parent699ef29e9fcf59eb1023c767cceab4de4f64ae13
am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
  Import translations. DO NOT MERGE