| commit | c98998a903cf79d502b29eaea81601cf185a0dfd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:11:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:11:31 2014 +0000 |
| tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
| parent | fd169d1ef698992444b785617a1da1df40059bd6 [diff] | |
| parent | fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2 [diff] |
am fdb3d6d7: (-s ours) am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2': Import translations. DO NOT MERGE