OSDN Git Service

am a37f9019: (-s ours) am 394ff738: (-s ours) am ea8de47d: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Mon, 21 Jul 2014 19:18:12 +0000 (19:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 19:18:12 +0000 (19:18 +0000)
commit576b53248ad670abcfef28c3cd5061f82b99cf89
treec30837d0c4383d16be6620dc2c59e6afca5349cd
parenta2db38ca9f11f84079a974175905506978332389
parent589b47ee19bf7c014f1c3ce4163fc78af0894f6f
am a37f9019: (-s ours) am 394ff738: (-s ours) am ea8de47d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a37f90190716efd30cacfc8ef2a83e4c078bf610':
  Import translations. DO NOT MERGE