tree 2653c43671ac7718a7ca1a8d1d1218b1eb6b5676
parent 4c107d98f6a3c46b0697247ac1f72d5284c2a964
parent 2413d4e04059ebca9c9114e47d30fd39cfa145ab
author Baligh Uddin <baligh@google.com> 1408284100 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408161360 +0000

Merge "Import translations. DO NOT MERGE" into lmp-dev