| commit | 65581fac70f35ffd7ea7443c8afc15ffb141346d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:14 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | 61c42768d1d54fa029f886f7a06372b63a8e6ba9 [diff] | |
| parent | 51de265795776130e175f72d73a9b2006e354e14 [diff] |
am 51de2657: (-s ours) am 30cfe2fd: (-s ours) am 5c714f49: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '51de265795776130e175f72d73a9b2006e354e14': Import translations. DO NOT MERGE