| commit | 5f4f95ca35f84018159787f2b39da074b38b82e5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:36:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:36:11 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | f0942091f21cf6db89d713ec469d8c59f135c922 [diff] | |
| parent | ea8f1f18bd55523171160b1a0595930d14553e68 [diff] |
am ea8f1f18: (-s ours) am 98989bd7: (-s ours) am 835c0b74: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'ea8f1f18bd55523171160b1a0595930d14553e68':