commit | edd51699eccbb684f296d754706e6f36dcab1f6f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Oct 27 18:51:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:25 2014 +0000 |
tree | 35177ce3c6cf8d873ea0f220bd9dc71fa69105f3 | |
parent | 9a3a3db19cc97307fbaa7a9e61204b359db026ad [diff] | |
parent | b209b0af2c93889b0f7596d6fad4946eb92c0844 [diff] |
am b209b0af: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b209b0af2c93889b0f7596d6fad4946eb92c0844':