| commit | 37edf497cadb60779acea644619332652088965c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 04 13:36:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 13:36:31 2013 -0700 |
| tree | 5345fb6edbad0c5f7ea8bcdd42feef07840f2a69 | |
| parent | 4293a8f0e93ec0c52362629419a866f8df8e0fb1 [diff] | |
| parent | dfbe5bdba878d6ff0e02964830bbad699e7aa34a [diff] |
am dfbe5bdb: (-s ours) am 1ce9c5a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit 'dfbe5bdba878d6ff0e02964830bbad699e7aa34a': Import translations. DO NOT MERGE