tree b660bb900c9f50d6745301c487094a18ae691c4e
parent 75305e2a3bd2e8e24d3f68770668d16fc54884b4
parent feaf3143eb75fe83724f33874ddfc8e3dc21f6d3
author Android Build Merger (Role) <android-build-merger@google.com> 1501099014 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1501099014 +0000

[automerger] Import translations. DO NOT MERGE am: 3de7ee4463  -s ours skipped: feaf3143eb

Change-Id: Ib7fca171cbb7f9a6832b5de2e1fd8c764400dfca