OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a -s ours
authorBill Yi <byi@google.com>
Fri, 24 Jun 2016 06:34:34 +0000 (06:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 06:34:34 +0000 (06:34 +0000)
commite266de328205fd9cd0116f6c1589e2737738ec55
treeffee558071687d7aacc08b1921b9b88721c91add
parentbf74f68fd9a85c375182bd17db02a68689001a35
parent1072cc117589d0e6e8e8aaf3f967da00e547d6b9
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a  -s ours
am: 1072cc1175  -s ours

Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb