| commit | 63e7219216d8e7724c86fcb8b582f482dafe6cdb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:22:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:22:58 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | be4af750bcbb3046a55a466e1beeb40d024e193c [diff] | |
| parent | 55e201fa7c86546e3bed9ade74f44288b4321623 [diff] |
am 55e201fa: (-s ours) am a9431f67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '55e201fa7c86546e3bed9ade74f44288b4321623': Import translations. DO NOT MERGE