OSDN Git Service

am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 6 Oct 2014 19:23:03 +0000 (19:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Oct 2014 19:23:03 +0000 (19:23 +0000)
commitf132e7ef0ece5a31595153ec71ef539b4c40f706
tree0c17ae1eb412190fd1dc9d24bffac42e32a7b5bc
parent3dd06aba8074fd3de68659f97d0136e05fc44c81
parentaa5c62f35999c2dc165771740e96c30b1b932aeb
am aa5c62f3: (-s ours) am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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