| commit | 1f8fe46d12436fdfd8570c76d51e5564bfd3a60e | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Jul 25 16:42:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 16:42:02 2014 +0000 |
| tree | be081d408e3a41431ba1109b2c3d40a671aa9a1a | |
| parent | ee079cdc4efd5bc60f4635a831c0d7a9aaf724dd [diff] | |
| parent | ee28206b6774d59fc1d054526aa5cdc0e38f7eb3 [diff] |
am 077b250f: (-s ours) am 7d4e16e0: (-s ours) am 4224281d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '077b250fb78bf215ebe3417161268a85af688540': Import translations. DO NOT MERGE