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