| commit | 5969801cc119ce58c7f18b1a9cbcc46c8b7ad232 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 18:02:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:02:47 2014 +0000 |
| tree | 0c39ec598d971bb0597124c50ca9db27ec549362 | |
| parent | 3782a3a6a1a1d22e553cf04231d76103aaf36a7b [diff] | |
| parent | a60df014e27d9cd57396655b98922394ff7d73bb [diff] |
am a60df014: (-s ours) am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a60df014e27d9cd57396655b98922394ff7d73bb': Import translations. DO NOT MERGE