OSDN Git Service

am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 14 Jan 2015 19:24:20 +0000 (19:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Jan 2015 19:24:20 +0000 (19:24 +0000)
commit7b62336f26bc5966080e8153690da4fa28f5adf3
tree7bff683fd37205ce15ed6d48e77296822b61aa3a
parent591a09131162a32ad5923dc3553a464a5da1d39c
parent3d600a06119f2c11ba2394d64a84348aa94fd520
am 3d600a06: (-s ours) am c51cfe3d: (-s ours) Import translations. DO NOT MERGE

* commit '3d600a06119f2c11ba2394d64a84348aa94fd520':
  Import translations. DO NOT MERGE