tree 277720002bc21c9948a2146196c64f5c66b4d49a
parent c56c32172e5f2cc7775a6fadaa3990c5685e14c9
parent 337c1b110856328476341b405c31accacf6d48b2
author Bill Yi <byi@google.com> 1464975088 +0000
committer android-build-merger <android-build-merger@google.com> 1464975088 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727  -s ours
am: 337c1b1108  -s ours

* commit '337c1b110856328476341b405c31accacf6d48b2':

Change-Id: I826a96483a3120cb89337179c8438053992f7988