| commit | 5893c2091a2f8102c49e11c5a11528adf08a90a0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Jul 25 16:48:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 16:48:28 2015 +0000 |
| tree | 7479a37ba5094fe342000fe03fcafceeb5c2be2b | |
| parent | 87876e31e62d6511cb1d6714916ecf2d57eeb89b [diff] | |
| parent | 87431eeac9c72854ff56727100ff3882ffdca3ce [diff] |
am 87431eea: (-s ours) am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '87431eeac9c72854ff56727100ff3882ffdca3ce': Import translations. DO NOT MERGE