OSDN Git Service

Merge "[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 21:56:02 +0000 (21:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Jan 2018 21:56:02 +0000 (21:56 +0000)
commitc17c2a8a39f69dabf6e7ac0502c003267d637c25
tree71e1c22df567314afb10bb412f74ee4f0a221199
parent13fa41700b2f8c58d2ab0c33d64645acb707f63d
parentd2ff1e42cc44283337016f6648ef43a0fe8c87f4
Merge "[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 am: 19f08130b1  -s ours am: fa70de88c5  -s ours am: b8bc53ecc3  -s ours am: d68ab1fd08  -s ours"