| commit | 205299ff0574521f179f8a4f344f0c2979ee4cf3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 15:21:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 15:21:52 2014 +0000 |
| tree | 995136c88be5e85b2a72ce46ef0daf48b8e3313d | |
| parent | fa0d0e01ad00d6cf7946690d8d01533cf1811734 [diff] | |
| parent | 6d87fdc91608b035e9a21152930488b8a2599b14 [diff] |
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 '6d87fdc91608b035e9a21152930488b8a2599b14':