OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Tue, 3 May 2016 16:41:39 +0000 (16:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 16:41:39 +0000 (16:41 +0000)
commitb7548188ae1855734f4889f1c8e3c16da102db83
treea6f5001210c2506ea287835a1cd84c6851a26a77
parent6474fa7d3b406c6a11b0d7f5c3fb4f47a6278b0c
parent94942bb0707cdf1430d0cd83909ad2ce87ea5f5d
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 94942bb070  -s ours

* commit '94942bb0707cdf1430d0cd83909ad2ce87ea5f5d':
  Import translations. DO NOT MERGE

Change-Id: Iefa14933fd9761e914207ff987c53cd72adfd2b3