| commit | 977620e8bc74e4b10441abc05e0a8509d22348f9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:04:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:04:56 2014 +0000 |
| tree | f2d85bdde8799bbf0218a214485908339f0b449a | |
| parent | 8ce06c0544ba4626a0f5ed9eef939634d421736f [diff] | |
| parent | 28f0306b1aa4f7cd19229e9d4bca87b9b44ffdf3 [diff] |
am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '59bde8429b1faa24e60957eca3db07214d43c1ea': Import translations. DO NOT MERGE