tree 9a7513c4b3e5ff6c6d1877ff2fc5e854ab626d4f
parent 76ec2380fcff325c0201948522290f0e5d8fae4d
parent 70906280ebee1f970c7672e76a8675e585382a96
author Bill Yi <byi@google.com> 1501109509 +0000
committer android-build-merger <android-build-merger@google.com> 1501109509 +0000

Merge "Import translations. DO NOT MERGE am: 495d4ce1b9  -s ours am: 120c3e9874  -s ours" into oc-dr1-dev
am: 70906280eb  -s ours

Change-Id: If5ae8d80646e4b2c68516e1441bc3b856c204907