| commit | b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:05:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:05:29 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | bbec724b2ae4677685a7300ae4b0c1e820cdf33a [diff] | |
| parent | 6b26d9d4fa6fa1e799beccbafab3278af09bf93d [diff] |
am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '6b26d9d4fa6fa1e799beccbafab3278af09bf93d':