OSDN Git Service

Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 12 Jul 2016 16:39:13 +0000 (16:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 16:39:14 +0000 (16:39 +0000)
commit9fde9f3e14f863e4b31912c47528eac9a7cb77ec
tree91e17e014c1eea8130a2ab018470c09fe3753e2d
parent24598843e0d66771838f5f6e5a3d3aba9e4c993e
parent9c96b1e11894976277b4374995ac8b8512b9997d
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e  -s ours am: 7d8fe60299  -s ours" into nyc-mr1-dev-plus-aosp