commit | ef990aec9eb4cf4c5e787082b8725779b9019864 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:42:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:42:34 2014 +0000 |
tree | 1a85c56fe5f4ec955bf1353ac9776b39396a627c | |
parent | 4b4223becb259cca72b9eec1beecbb99543af889 [diff] | |
parent | 97cc56623cb9222d8f6c55cf53a04518b7dfd6a8 [diff] |
am 97cc5662: (-s ours) am 282de588: (-s ours) am 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '97cc56623cb9222d8f6c55cf53a04518b7dfd6a8': Import translations. DO NOT MERGE