| commit | f30206e1e7eaf2b603f8096a60a0f31497c5eb3c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 15:07:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 15:07:49 2015 +0000 |
| tree | 4d4b92e048a3c95e675c225c377ddbbfbff1e75d | |
| parent | 1700eba13eec1d0a46afbbea038cbd4c5c79ea73 [diff] | |
| parent | 49b22e94732bd9c46a7eaa29be3929b7d8b4b77a [diff] |
am 49b22e94: (-s ours) am 9314ed71: (-s ours) am 4ad686f1: (-s ours) am d1456085: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '49b22e94732bd9c46a7eaa29be3929b7d8b4b77a': Import translations. DO NOT MERGE