tree 3431076a69902022df1db7553ba6e2ef0ae0aa99
parent 488ea0b715465d72fba0e9498cbe69b59981d20b
parent 0a2dbc7a8ff6b247baa8a85df84a9829a64dacb8
author Bill Yi <byi@google.com> 1478606568 +0000
committer android-build-merger <android-build-merger@google.com> 1478606568 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0a2dbc7a8f  -s ours

Change-Id: I98c68abf6c4b81af8dc1a2bb31a7ba5c586673fb