tree 51fbbf5b8f8f5f12fc209caea2b1cf2ad3c82f91
parent f8ccfe4479ffe7c8d8b5f1b31681f00fe5d0fb5b
parent f20ff3a07e6120c248cab001f572dc071f5c08ee
author Bill Yi <byi@google.com> 1467349587 +0000
committer android-build-merger <android-build-merger@google.com> 1467349587 +0000

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: f20ff3a07e  -s ours

Change-Id: I2ced2f5a656e6eab6eb01b2a78ba3c0707ecd32b