| commit | f7892c0b8a6ec3d92c825605ab2f5036d3bc1c8a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:15 2015 +0000 |
| tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
| parent | d7f91bb404c6caa3ddddab040f2e6a8c90628dbe [diff] | |
| parent | 2cef65fb15974f2b0a7cf0be7bef2e9200e0312d [diff] |
am 2cef65fb: (-s ours) am e42bad45: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2cef65fb15974f2b0a7cf0be7bef2e9200e0312d':