commit | 59bde8429b1faa24e60957eca3db07214d43c1ea | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 15:58:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 15:58:04 2014 +0000 |
tree | 1fda4e581cd581bbd556c27f3d874e4406aa56c2 | |
parent | 8188fb92b3001f70d007a5b04dc0ddf526fc674f [diff] | |
parent | d8ed806034764b855b78d3b696c3307e5e8d2ce4 [diff] |
am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'd8ed806034764b855b78d3b696c3307e5e8d2ce4': Import translations. DO NOT MERGE