commit | 85b53bed8ead20591afff530d2b54ee714446114 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:12 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:12 2015 +0000 |
tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
parent | b0830cdcd729bc46506579d9db06d048753dc6aa [diff] | |
parent | dcf1904b2e5716063e5b890ce94f0358ec761f07 [diff] |
am dcf1904b: (-s ours) am 95199141: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'dcf1904b2e5716063e5b890ce94f0358ec761f07':