| commit | 3d43dcfd2920613556ade9e61c5fc0877f7cfc7b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 18:43:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 18:43:04 2015 +0000 |
| tree | 01404c9c5d7059aca8bbc9e2efe1afe15e89693e | |
| parent | 8b874fa0a4c94ccc4dd30f28f63c71ce15a6e137 [diff] | |
| parent | e71428332036a2fb5c3a963a9624440a02c574fe [diff] |
am e7142833: (-s ours) am 0c3583bc: (-s ours) am cc2fa7a2: (-s ours) am 659702d9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'e71428332036a2fb5c3a963a9624440a02c574fe': Import translations. DO NOT MERGE