| commit | 0bf54c40ffb49796846e53cbef860d0069fcd612 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 25 19:59:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 19:59:28 2013 -0700 |
| tree | d01fa0368fbc01165a1a6aaf5b1d13120c804b7c | |
| parent | 303a95e094a74f63e30feeb02e5fb786885cdd77 [diff] | |
| parent | a8f7a423cff81dde405b0be518883847c81da6f1 [diff] |
am 736c7f44: (-s ours) am 1ffe09e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '736c7f44b1bb0d4e27d65ddc9d514a4b43b840cb': Import translations. DO NOT MERGE