tree fcb0e07ea26cd5c428019ed9f4a9d5fd33bf248b
parent 62c3698a79280fcf1188bfe861412bc87480b235
parent 8d95e04111523dad0ecdaca2caeb29398aafbd4b
author Bill Yi <byi@google.com> 1493985605 +0000
committer android-build-merger <android-build-merger@google.com> 1493985605 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 8d95e04111  -s ours

Change-Id: I2306f269edb62724a2c087e3f9509e5c938942fb