tree c68cd4eae5e1ec9f9a87785593ff553a9dca0454
parent 0bc96a736a1a8392f8a8bccd12c14bbf78b8f784
parent 97ee2b1fbec2735bc54877f907447e0047aa07b6
author Bill Yi <byi@google.com> 1461713161 +0000
committer android-build-merger <android-build-merger@google.com> 1461713161 +0000

Import translations. DO NOT MERGE am: ca5003e  -s ours
am: 97ee2b1  -s ours

* commit '97ee2b1fbec2735bc54877f907447e0047aa07b6':

Change-Id: I22fda6dc0d92828b8331dbac473264d0f2295b0c