| commit | 34ea77018043eee55de7295657c408565fd5a56c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 20:22:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:17 2015 +0000 |
| tree | c223dc0587b5c4cbce365eb8c243746e05fa3a4b | |
| parent | f7892c0b8a6ec3d92c825605ab2f5036d3bc1c8a [diff] | |
| parent | a74496734bf2a2761c198d75c986dd3fd4d8920b [diff] |
am a7449673: (-s ours) am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'a74496734bf2a2761c198d75c986dd3fd4d8920b':