OSDN Git Service

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867 -s ours...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:22:19 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:22:19 +0000 (18:22 +0000)
commit9312ee110b168b6640ac47dcb930bd08ca7c17ea
tree25e090f9cc465aea0761ee721fcde3aadf0f3556
parent1cf8eefca71651785eccc15724ba546d48759252
parent179fab5e9cfb1467a594a0a51f2038f1ec653e0c
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3849360867  -s ours am: d82970fa79  -s ours am: 6b1d586689  -s ours
am: 179fab5e9c  -s ours

Change-Id: I6f2d5ddc35f0671fa6008642ad0647b04aa6e4a5