OSDN Git Service

am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 1 Apr 2015 10:18:24 +0000 (10:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Apr 2015 10:18:24 +0000 (10:18 +0000)
commit47121c5e1e42e68345b6b994091904549509cfe4
tree61f10cb453fa06f45bc006eacba9d22cbc01d58a
parent8dae38f2e51f2f1193523ac87c78192a302668f8
parent22c930457a3f5848ec699fc79e38c4c0d2e5963a
am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE

* commit '22c930457a3f5848ec699fc79e38c4c0d2e5963a':
  Import translations. DO NOT MERGE