| commit | 1021bb96d15cddfaa05aff5186285be582eeade3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:09:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:09:14 2014 +0000 |
| tree | 7dc28272b68d4f0bff67581ee191b80f5edb15f8 | |
| parent | a2cab633c6f5a0efc8a22511ab5a658c757f4c0d [diff] | |
| parent | 864e24715bdbd1c509628568868b1f8447801df4 [diff] |
am 864e2471: (-s ours) am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '864e24715bdbd1c509628568868b1f8447801df4': Import translations. DO NOT MERGE