tree 0a8fc7b85e12a20accc3577d18d2c57bf570a8c0
parent ab60d6b44e1f4df22e324dd194dc9e1e8aca2513
parent 6f24c015efc76e568b4abbbd0d455c41de52fab6
author Bill Yi <byi@google.com> 1501109744 +0000
committer android-build-merger <android-build-merger@google.com> 1501109744 +0000

Merge "Import translations. DO NOT MERGE am: 69d0838208  -s ours" into nyc-mr2-dev am: 3bcdbff889  -s ours
am: 6f24c015ef  -s ours

Change-Id: Ifce7209bce43d5228d1f2e32b1fffa43daf5d793