| commit | e862c1ebac4537b2c104486de3cd965e7aff1d82 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:03:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:03:37 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | bc73cc58612c13626d9bea05859deef5475f44c2 [diff] | |
| parent | b6a22674dd6006167b8d90d4c198f173548991f9 [diff] |
am b6a22674: (-s ours) am 62afccaf: (-s ours) am 5c49a8df: (-s ours) 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 'b6a22674dd6006167b8d90d4c198f173548991f9':