| commit | 5d7e78410827a98a62587482016288f9d3d2a077 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 26 15:29:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 15:29:13 2015 +0000 |
| tree | 2fd83c97db5a6ee24e595eba9925814cecad96ac | |
| parent | 637186e12b3ece6c54c2a4a74e2eb851030ad816 [diff] | |
| parent | 849673eddda7924d33b18b25bf81758ffab7eebe [diff] |
am 849673ed: (-s ours) am 26a3e949: (-s ours) Import translations. DO NOT MERGE automerge: 808ac6c -s ours * commit '849673eddda7924d33b18b25bf81758ffab7eebe': Import translations. DO NOT MERGE