tree 5aafdcb3156dad4e99bf736e79282f93c3a8b15d
parent e7f3fe19e2b3fc616b549b91f7e5dbf6ad9c2114
parent 6e7a3eca6fde256f548cd7bb115445f85cfefbfc
author Android Build Merger (Role) <android-build-merger@google.com> 1481040320 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481040320 +0000

Merge "Import translations. DO NOT MERGE am: 2a1d7f9dd5  -s ours am: e1af21d173  -s ours am: 02a2befe44  -s ours am: 45e7b2bb9e  -s ours" into nyc-mr2-dev-plus-aosp