| commit | ddcb8c6562b09c07ff60a18552d9d153ae7ede09 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Apr 10 16:02:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 16:02:22 2014 +0000 |
| tree | 2951c9446e9a279be4d35a594b738617ca0ee939 | |
| parent | 3243040cdc4db1cc4a25e8cea108b0e4dd0eed25 [diff] | |
| parent | 2271a91c327cee8a6c1dffcbfd3419c95d56c37e [diff] |
am 2271a91c: (-s ours) am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '2271a91c327cee8a6c1dffcbfd3419c95d56c37e': Import translations. DO NOT MERGE