| commit | 859a9548ae095a2eb237c6c94680cec2963e6bd3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:50:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:50:14 2014 +0000 |
| tree | c44ebe1dfccbb5a522b45fca31affd52207d952a | |
| parent | ac2b5e9377123426ad9d5808586be866eb686f4e [diff] | |
| parent | 36e5a1de725f790ab63bec58f58bed01f2eea466 [diff] |
am 36e5a1de: (-s ours) am 4efde5eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '36e5a1de725f790ab63bec58f58bed01f2eea466': Import translations. DO NOT MERGE