tree fc9702f012503330039033d43b48f09fe27ebb81
parent d77dad9852cefa5f938ff50dcd87704fafe5b972
parent 7e862ae447b1a503bc443600891e22e034abf3fd
author Bill Yi <byi@google.com> 1499746184 +0000
committer android-build-merger <android-build-merger@google.com> 1499746184 +0000

Import translations. DO NOT MERGE am: a01540d3d5  -s ours am: b6bf465506  -s ours am: 2d44c898e5  -s ours
am: 7e862ae447  -s ours

Change-Id: Ia2586cdafe020e2d4ccdbf71017fd4a1781b01d6