| commit | c634cbe14365bac44a2bb671ede6534566ac22b8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:09:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:09:16 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | b48a6519cc412aae55ef8914209b09d87f801603 [diff] | |
| parent | 78939d63861176fbc42008fa86a2de45cad2bbf5 [diff] |
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 '78939d63861176fbc42008fa86a2de45cad2bbf5':