OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 23 Jun 2017 15:32:57 +0000 (15:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Jun 2017 15:33:06 +0000 (15:33 +0000)
commita76010fa02ce75156aab85e18b9491d91afdfa6d
tree0735977de7dc830a8bdfd4c2f222eb90873619a1
parent516b3e719527b214329f6d596939f6165bb347a8
parent315e08aa4ec2c1c93fb28551eb9ff652f62dedb1
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours am: 53f4db5612  -s ours" into oc-dr1-dev-plus-aosp