| commit | a8aab1d61d8e06b75103b6cb34fb5646896b9c01 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:19:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:19:11 2015 +0000 |
| tree | dde12831e3589ec9f2f2bd657262786dc7c94ae4 | |
| parent | 137cc5d34e147339948f60f52564679be32a99db [diff] | |
| parent | c634cbe14365bac44a2bb671ede6534566ac22b8 [diff] |
am c634cbe1: (-s ours) am 78939d63: (-s ours) am 4172b16a: (-s ours) am 92aaaa88: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c634cbe14365bac44a2bb671ede6534566ac22b8':