tree 76d413656997c79af9f0498d75e9582a7d87a70c
parent f21beb12f95b311ae20f2b5058252eb386a8b7b8
parent 3241a48ee5f5b185097899ff3abc7959799148bb
author Baligh Uddin <baligh@google.com> 1443536183 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1443536183 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master