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