| commit | 6d71a22441d065a5a2122007fcd66fae9590e5f1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:06 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | e6f65c0d0a28ae72322392c90525f8f705b839e4 [diff] | |
| parent | 417f375851d1808dcea9a9b301c9055e49f99914 [diff] |
am 417f3758: (-s ours) am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '417f375851d1808dcea9a9b301c9055e49f99914': Import translations. DO NOT MERGE