tree d07e1c7aafdbb0ecc07ae56b288a3f64a05e92e2
parent 741cea0d89b1234d26649ec2207b2122c1f626a3
parent 1ddd928abf4a0136240d20571def7756f48e2b3f
author Bill Yi <byi@google.com> 1466073001 +0000
committer android-build-merger <android-build-merger@google.com> 1466073001 +0000

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76  -s ours
am: 1ddd928abf  -s ours

Change-Id: I130fc02f0118dccfc237edb34f077e92c0dfaa2f