| commit | fde758062c2591fe823f0b1214dafbff220eb9ed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 21:24:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 21:24:05 2014 +0000 |
| tree | 418b2188c38647a542d3ae0ba6ae1a904e8b38eb | |
| parent | 26313e3a818704e08a7d3f88fb4ae19b14d96e18 [diff] | |
| parent | ff995d4cb88901d3294a90fde79f9ac6c32941ee [diff] |
am ff995d4c: (-s ours) am 54ff084b: (-s ours) am 1ec23cf6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'ff995d4cb88901d3294a90fde79f9ac6c32941ee': Import translations. DO NOT MERGE