| commit | 3c58e4ca2c01dce84d3a89a40d2de7569ba87fe3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 16:31:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 16:31:49 2014 +0000 |
| tree | 3d2cfe1e99cb069646c3f1a38912eff27368f812 | |
| parent | d1b3f15b4a9dcd23388ca1ae6793639fa5fcf216 [diff] | |
| parent | 2e2fd473be7a8ebb6392643812eb9119c402cbbb [diff] |
am 2e2fd473: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2e2fd473be7a8ebb6392643812eb9119c402cbbb': Import translations. DO NOT MERGE