tree bddc3d791c7f417a5fd1d5bae327019db1d59d78
parent 51bca143862c568507206adf119c9003a4f3f764
parent 44ed3c11489bbad2252639a0e9679f25554a5396
author Baligh Uddin <baligh@google.com> 1417569910 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417569917 +0000

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