commit | a19636711378e15436bf83f381ae811f778caf25 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:19 2014 +0000 |
tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
parent | 9b0ae11dc87d93a523ac6c18f8c0aed38bddd102 [diff] | |
parent | 82dd44206706358169f2102d8b2a4ed43989aa6e [diff] |
am 82dd4420: (-s ours) am 64b61028: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '82dd44206706358169f2102d8b2a4ed43989aa6e': Import translations. DO NOT MERGE