commit | 93a772cb863fd52953748766f8371a967194259e | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:14:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:14:12 2014 +0000 |
tree | 7dc28272b68d4f0bff67581ee191b80f5edb15f8 | |
parent | 55c933777e827e9b01a4e4e3592e259ec91bae5d [diff] | |
parent | 4547cfeb07d50fd5360cd4bb545cf052feccbc0c [diff] |
am 4547cfeb: (-s ours) am a7d7437c: (-s ours) am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '4547cfeb07d50fd5360cd4bb545cf052feccbc0c': Import translations. DO NOT MERGE