| commit | 877efd1bb3ae5e9e5999b8e56fc4c2b27a2bbe99 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 15:26:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:26:38 2014 +0000 |
| tree | 21d77ce5736ede88a3558527dbd68c175defa1b6 | |
| parent | a7f905f0f23fadc120eff1e7f167f3ee4c76e043 [diff] | |
| parent | 03d63c030c281f1290de366eceaf07b0e361e810 [diff] |
am 03d63c03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '03d63c030c281f1290de366eceaf07b0e361e810': Import translations. DO NOT MERGE