tree ce77a4688d19988b5371aca8fe01f4eea356ec06
parent 6b0ffbfbd021daea8c79ee4cc4fe8830cda8abb9
parent 25f967a8a2080f23ee1e65edf8629b139611680c
author Android Build Merger (Role) <android-build-merger@google.com> 1465906907 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465906908 +0000

Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb8b32262f  -s ours am: 960a0a8fec  -s ours" into nyc-mr1-dev-plus-aosp