tree ee9d81be0296d3001f0fcff533dc0ee30433d10a
parent 7778bfb4edde6802173175fb9fe28748b7c60e13
parent 9d9ea4c320185c358551e6850b5cf78d6fc4c6e6
author Bill Yi <byi@google.com> 1520063346 +0000
committer android-build-merger <android-build-merger@google.com> 1520063346 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 am: ac782db7b2  -s ours am: 1f6fdce0b0  -s ours am: b90a10513e  -s ours
am: 9d9ea4c320  -s ours

Change-Id: I98975c0659945be13e318b5a296fa849768eea3a