tree 2ccd35418437142c5f6d07ae1c56cfca2d732a7b
parent 62bd0a9cb1ed865c4727c174a3d9fedc515b44ad
parent bf44cb7363e90a0c0d17a427df29f4e42f9885bc
author Bill Yi <byi@google.com> 1466139567 +0000
committer android-build-merger <android-build-merger@google.com> 1466139567 +0000

Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9  -s ours
am: bf44cb7363  -s ours

Change-Id: Idab1e4edff135cf0f426aa6150e30f612e43937b