| commit | 57217ae00a69c1a6359c634881934064a0b3564f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:42:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:42:38 2015 +0000 |
| tree | 0436e56517630dd21b356687377eeb1b21de8c88 | |
| parent | 2f38c25b0bdad021ca87a896327aa172779ede09 [diff] | |
| parent | edfdeeee309c19c553f5a5661d4070b5132995cf [diff] |
am edfdeeee: (-s ours) am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours * commit 'edfdeeee309c19c553f5a5661d4070b5132995cf': Import translations. DO NOT MERGE