| commit | 72e6f01eb11343c7a053b3486f48b6dc3ae68e4e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:09 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | 451e202ee73cfe8865fca6687dea5a725c080fa0 [diff] | |
| parent | 0184642b72d9b9413c444977b731a359e897e377 [diff] |
am 0184642b: (-s ours) am 95b0388a: (-s ours) am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '0184642b72d9b9413c444977b731a359e897e377': Import translations. DO NOT MERGE