| commit | 8528cf5de462b6ffc097ed5d51e82b0cccca89e9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 06:17:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 06:17:15 2014 +0000 |
| tree | e3b45e81753a9086747f9ae350b2ae0ba3ef2285 | |
| parent | b0a7e6620d8ca0be59885c9a8405b354d6cc6cc8 [diff] | |
| parent | 205299ff0574521f179f8a4f344f0c2979ee4cf3 [diff] |
am 205299ff: (-s ours) am 6d87fdc9: (-s ours) am b8e5771a: (-s ours) am 32dd3637: (-s ours) am 3dc60179: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '205299ff0574521f179f8a4f344f0c2979ee4cf3':