| commit | c9407fc5a9d680d69cdfd7e24cf1cc00bbbf596d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 04 01:17:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:17:31 2014 +0000 |
| tree | 308bfe160bdd2b8f1774e6606c2f4a2d2a9732cd | |
| parent | 6462184e288685d63aedac142ac84bd1c82b1af3 [diff] | |
| parent | b8e32c967ec4dd0b194715c9d029a37f391a837f [diff] |
am b8e32c96: (-s ours) am 813e1bfe: (-s ours) am 13ff526b: (-s ours) Import translations. DO NOT MERGE automerge: eccc844 -s ours * commit 'b8e32c967ec4dd0b194715c9d029a37f391a837f': Import translations. DO NOT MERGE