| commit | b6a22674dd6006167b8d90d4c198f173548991f9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:28:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:28:13 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | fb914562e4a1fc81fab90e574c9fd4a677b1e513 [diff] | |
| parent | 62afccafaa29519ef90671b70ce6c174107b782d [diff] |
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 '62afccafaa29519ef90671b70ce6c174107b782d':