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