| commit | 074de5677db77a19c424743aa7abb44f0faca83a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:22:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:22:45 2014 +0000 |
| tree | 31e22746cd36c2f4b87e73c58753b18d63a31669 | |
| parent | a0adfedaf04a2ce6929a5d260dfd28087309e2da [diff] | |
| parent | 1571297dab31aba920d93d1f66e228b86ba5abb4 [diff] |
am 1571297d: (-s ours) am 64667070: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1571297dab31aba920d93d1f66e228b86ba5abb4': Import translations. DO NOT MERGE