| commit | cdbfad196137eafcef7f63182c308e020ef8c4d4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 17:00:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 17:00:13 2015 +0000 |
| tree | c40301c5a88b3fbe83b645265d8e70a4655203b3 | |
| parent | 1cc10979a6f2d48f22d6498f71f6069b0af5d135 [diff] | |
| parent | f90bed86a948f76353059ae6abf03bcfc9188a87 [diff] |
am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '4f5630e51d03980e80fde93154f5a0302c8179a2': Import translations. DO NOT MERGE