| commit | fd855986099c00c50bf62c2cd69796a9066d774d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:35:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:35:28 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | 31071314cf566b517b9098d8432c60a688223663 [diff] | |
| parent | baa5881192234e830f7a239f10a412dd58084884 [diff] |
am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'baa5881192234e830f7a239f10a412dd58084884':