| commit | 5c49a8dff24feab476d2c379fbb7e521f2996c8c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:36:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:36:18 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | 542cf02d69be16ac39c5839f81cec43cda2802d4 [diff] | |
| parent | 4776bdf4d01c0a806c86379e4d6092f98340c7ea [diff] |
am 4776bdf4: (-s ours) am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit '4776bdf4d01c0a806c86379e4d6092f98340c7ea':