OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:31:33 +0000 (06:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:31:33 +0000 (06:31 +0000)
commitfbe8eef154fcb38a812a398e0148067ad2cfc903
tree8645d9abdcc6e7fb5d276618b03ec087b380ca15
parent77cf704647d9447307b6dca4514c5204a6d17b97
parent86875e592af37b2a26a77bfe4c5ba9c63558ebda
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 86875e592a  -s ours

Change-Id: I795e3260079e0cbba134235b7315ff4cbe67342a