| commit | ec71a21787c94c0698f98316a6189d3a472bdb88 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:09:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:09:18 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | c634cbe14365bac44a2bb671ede6534566ac22b8 [diff] | |
| parent | 75a054602c2770fa66d85d22466f20ca2cdf7694 [diff] |
am 75a05460: (-s ours) am ef9b3c13: (-s ours) am e397cbe2: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '75a054602c2770fa66d85d22466f20ca2cdf7694':