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