| commit | 451e202ee73cfe8865fca6687dea5a725c080fa0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:08 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | 6d71a22441d065a5a2122007fcd66fae9590e5f1 [diff] | |
| parent | f81efca101f19f5801671e30caf25c0e8e3f22e8 [diff] |
am f81efca1: (-s ours) am 751f64df: (-s ours) am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'f81efca101f19f5801671e30caf25c0e8e3f22e8': Import translations. DO NOT MERGE