tree 854dc3f70512fcf2298e4774f49ccdf35f2a2dc7
parent 67162a220cd4b7272b8b65f42f633b8a8065d185
parent 637eb2d9edd36da7a3e8e1d8c3574b980cc849e3
author Baligh Uddin <baligh@google.com> 1443537560 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1443537560 +0000

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