commit | dc4b1fd5ee28d872befa744f9ba3ee07bbe15271 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:00:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:00:11 2014 +0000 |
tree | 12196777fa6fd4600b7be18c0541d4ef42f9a2fa | |
parent | dbb79e1939eb264d5a700fe7e30ad2dee1698f8b [diff] | |
parent | 6019758bf024a0ad13ea8c8008519ff23f2bf43e [diff] |
am 6019758b: (-s ours) am 1b02ce54: (-s ours) Import translations. DO NOT MERGE * commit '6019758bf024a0ad13ea8c8008519ff23f2bf43e':