| commit | 93c6f4fc3a0459bad43efd02097c3f133cc0679b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 14:54:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 14:54:45 2015 +0000 |
| tree | d2658caf61ec2cb001e7fd6ccb93297d9b4d563c | |
| parent | 7f15902c4bfaf2c74f7702cb68af03e9f9d08008 [diff] | |
| parent | 20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2 [diff] |
am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2': Import translations. DO NOT MERGE