| commit | a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 16:25:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 16:25:45 2014 +0000 |
| tree | bfe5b6e7ad83c93fc4b1789cdc651114390a8092 | |
| parent | e5191aabff5b9b751349b8634836a858af744905 [diff] | |
| parent | 4545b1d29b23cbfe11aa7ca6b54f6518a38db278 [diff] |
am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4545b1d29b23cbfe11aa7ca6b54f6518a38db278': Import translations. DO NOT MERGE