| commit | e6eae1609e73205edd560846a032c89dabe9827f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 05 19:41:24 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 19:41:24 2013 +0000 |
| tree | a4f6093c1594b8a53778e964599baa3565664215 | |
| parent | 1612eac06df6ce849cb95935c70ba94093f8d321 [diff] | |
| parent | 2d1716a8cdc95977c243fe8a642b41f42be565d0 [diff] |
am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2d1716a8cdc95977c243fe8a642b41f42be565d0':