| commit | 62d814f9b449b054b33db9587bc9764267571c17 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 21 14:10:26 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 14:10:26 2013 -0800 |
| tree | 6deeb52821e730cfc029e23963c17298801018cf | |
| parent | e178a756df4af2ac14b2123dbf76c8f788addbc7 [diff] | |
| parent | 548614a4e6e0571d5cf06eb5514d0db8fc017d0b [diff] |
am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE * commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b': Import translations. DO NOT MERGE