| commit | f3f909d48ba46288e4c6f4f793438963656a1cdd | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:02:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:02:22 2014 +0000 |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 | |
| parent | 054b5bbb2bd8d09dde5ce8f5a3335fde446e92fa [diff] | |
| parent | bd42c307c4c0138d36dbe22c2e1ca7e92e71b117 [diff] |
am bd42c307: (-s ours) am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'bd42c307c4c0138d36dbe22c2e1ca7e92e71b117': Import translations. DO NOT MERGE