OSDN Git Service

am 7a99eb4d: (-s ours) am 7b5665ee: (-s ours) am 33b0cf1f: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Mon, 21 Jul 2014 19:18:17 +0000 (19:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 19:18:17 +0000 (19:18 +0000)
commitdbb04908b19fccf11be87574742aa8127687e283
treec30837d0c4383d16be6620dc2c59e6afca5349cd
parent576b53248ad670abcfef28c3cd5061f82b99cf89
parent3c8e65007aafa211cdfa6e1778ec10b603ce5815
am 7a99eb4d: (-s ours) am 7b5665ee: (-s ours) am 33b0cf1f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7a99eb4dfa1e12a79122d1760eeff9f5f9ff0f27':
  Import translations. DO NOT MERGE