tree e0f5bab73f038bc3d67b30457d694d1dba3168d2
parent 2a99d013239385f838449af2c5ec9bb31dbfa84e
parent 4dc11c28bfbe83246317ea8aefd544daae583291
author Android Build Merger (Role) <android-build-merger@google.com> 1467257408 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467257409 +0000

Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372  -s ours am: 847dcc9f4e  -s ours" into nyc-mr1-dev-plus-aosp