| commit | c218d8f19881deed098875e2caf41b7ca9e42133 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 17:45:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 17:45:58 2014 +0000 |
| tree | 81cbfccc8a16e6d2f387feb84aa1dee42d2d64e2 | |
| parent | 6580c273a51daee08972149f2d2ede8ef6e7a79a [diff] | |
| parent | 00e4d7830cc7834efdcec2a35d130cbc89e16551 [diff] |
am 00e4d783: (-s ours) am c71a7b3c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '00e4d7830cc7834efdcec2a35d130cbc89e16551': Import translations. DO NOT MERGE