tree b4d3fb65f023d7847172360e197ae1cf9ef759ed
parent 03bbd776ba9ebd6b3aa78efd32956eb9e8e9ab92
parent 804046e98f89ae9c38f18f1f58cb48a790fac6df
author Bill Yi <byi@google.com> 1481216860 +0000
committer android-build-merger <android-build-merger@google.com> 1481216860 +0000

Import translations. DO NOT MERGE am: b7d0c66e6d  -s ours
am: 804046e98f  -s ours

Change-Id: I27be850eb2e8e668911b539094ceee3bfb577e58