| commit | 8883bebd0fd32ca9183bbda6a9fe0f7f163964dd | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Dec 11 23:04:54 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 11 23:04:54 2013 +0000 |
| tree | d5f18c571fcd6b9ee6fe6aa0f1f4d4c232aba159 | |
| parent | a1763a63346b142487721a9c72567957287fe808 [diff] | |
| parent | 851138fcee54877c9a2cc4102427a3ecc126bbea [diff] |
am 851138fc: (-s ours) am dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '851138fcee54877c9a2cc4102427a3ecc126bbea': Import translations. DO NOT MERGE