| commit | 5b114e85ea46691629b16483d8519982a332b8fb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 10 17:17:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:17:38 2014 +0000 |
| tree | 771e96b8049f69a0d332cd8fbd8f56459fb31b9e | |
| parent | deb466201ae333fe343d7aefb69366eea8dbc48a [diff] | |
| parent | 30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4 [diff] |
am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4': Import translations. DO NOT MERGE