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