| commit | b0830cdcd729bc46506579d9db06d048753dc6aa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:11 2015 +0000 |
| tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
| parent | 91f9541dcd35092e8d42a0cc479b7b03dc1610aa [diff] | |
| parent | d1a615e9a2ab2cd18277064091c243b9b7e61d82 [diff] |
am d1a615e9: (-s ours) am dbba2217: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'd1a615e9a2ab2cd18277064091c243b9b7e61d82':