| commit | c5378ab518dfd5e4258d36d71df3d78a0cb76cdf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 19:15:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 19:15:15 2015 +0000 |
| tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df | |
| parent | bf78963c5d852387a8ee81393838012d439d4ce9 [diff] | |
| parent | 2c636248dd7e62c4f17c304df08eb73652d788fa [diff] |
am 2c636248: (-s ours) am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '2c636248dd7e62c4f17c304df08eb73652d788fa': Import translations. DO NOT MERGE