| commit | 55c933777e827e9b01a4e4e3592e259ec91bae5d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:14:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:14:07 2014 +0000 |
| tree | 7dc28272b68d4f0bff67581ee191b80f5edb15f8 | |
| parent | 2ca702a8a04016fa3c41ff6a982c68607e933080 [diff] | |
| parent | 3cad9ae1d210535746b0714924877d97ab8f4e34 [diff] |
am 3cad9ae1: (-s ours) am 59bde842: (-s ours) am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '3cad9ae1d210535746b0714924877d97ab8f4e34': Import translations. DO NOT MERGE