| commit | 4c32e8aa4e3672cb287ac67c446c24e1f635b29d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Nov 05 15:53:48 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 15:53:48 2013 -0800 |
| tree | b8b8aa3acc9b8b94b80155c2b93d79343299cee3 | |
| parent | 78c581f18d65a059f2647d3940c077310c8fe248 [diff] | |
| parent | e6243f79f3ce6daeb2d8d879e6e1a684ffc1b2fc [diff] |
am e6243f79: (-s ours) am c8a6ec7e: (-s ours) am ae2704a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e6243f79f3ce6daeb2d8d879e6e1a684ffc1b2fc': Import translations. DO NOT MERGE