tree c348e640d56e590d668c6c56b48477cfb12258a8
parent 6ccb5afd56bc13598b290b5cef15b53cb09ed910
parent f1a410e6d54e8331ec7b1ab48717807aa4807e20
author Bill Yi <byi@google.com> 1528132438 -0700
committer android-build-merger <android-build-merger@google.com> 1528132438 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: f1a410e6d5  -s ours

Change-Id: Id8e308c63fbb79385f0e4150b0243cc824462821