OSDN Git Service

am 08f6d923: (-s ours) am a5aa9acc: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 5 Jan 2015 14:36:40 +0000 (14:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Jan 2015 14:36:40 +0000 (14:36 +0000)
commitf6f9380c82ab1cc1070cf7adf895f5e98806901b
tree9b1723649b85fe2139e248ef5ff95bc535ba7c10
parent8dfaf90444efce91643ee20896366ec113b2236a
parent08f6d92343e0fb8d03aae1b369797166a2e56870
am 08f6d923: (-s ours) am a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '08f6d92343e0fb8d03aae1b369797166a2e56870':
  Import translations. DO NOT MERGE