tree e79ddf25ab36a43fca6f18090d5ef101d7d48f39
parent b662806c3abb9bc15df667d6dfb3ac676bb0ee86
parent f819d088df784b1e2346f6ffe9d843f8acb7e7e8
author Bill Yi <byi@google.com> 1501121452 +0000
committer android-build-merger <android-build-merger@google.com> 1501121452 +0000

Import translations. DO NOT MERGE am: 327f6730c7  -s ours am: 71e3e281e2  -s ours am: bce6144169  -s ours
am: f819d088df  -s ours

Change-Id: Ib48168ef616bf96bb15ad09d1e4e52fff99c89a9