| commit | 94eb04617fdb73d74c5f1751f674762e6657dc03 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Dec 05 00:14:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 00:14:20 2014 +0000 |
| tree | ba4620e019c0187330c41f1cf7b83b4d80bdc6b9 | |
| parent | 0c8a2d63be1192e4b67297ca592e815b0abd9746 [diff] | |
| parent | eb5b7721df47a601d3707a7bcbf32d61efe09c5b [diff] |
am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b': Import translations. DO NOT MERGE