tree cddcc3e030137a8f1fd5e16a339b31f34fade1bd
parent 51cee7c43f6929c1e1ea1f8ca825f2da331debd5
parent 1860adf0cd381f19ec6d7a4aa9e6a9b9cb42b70e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516921909 +0000
committer android-build-merger <android-build-merger@google.com> 1516921909 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 4f9f892582 skipped: 1a68c01ae5 am: 6f59280206  -s ours am: f19c7ab533  -s ours
am: 1860adf0cd  -s ours

Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3