| commit | 813f6d801f5b38d50d5f15ce399457032e005186 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:11:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:11:39 2015 +0000 |
| tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
| parent | 97c66ce52dc20a705f1d289ce1c3111ae936723c [diff] | |
| parent | a2fd9c6cdd094e6a076949129c01ca6d10d6fa24 [diff] |
am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'a2fd9c6cdd094e6a076949129c01ca6d10d6fa24': Import translations. DO NOT MERGE