| commit | b266393ecde6ec273209cfde4c062d9e267eb935 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 15:07:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 15:07:27 2014 +0000 |
| tree | 3a5962fc2497aa02de8bda95ddf87c1792bad799 | |
| parent | 15a8a1531eb457a71fe2db6c6d2bde981d5d7944 [diff] | |
| parent | b9f245d4645e4f3ed47a2a587540505576b96524 [diff] |
am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b9f245d4645e4f3ed47a2a587540505576b96524': Import translations. DO NOT MERGE