| commit | a1243ac690b5f07ee1cba9bad71dfffd6f6eb2a6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:11:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:11:24 2015 +0000 |
| tree | bb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26 | |
| parent | e7fc3ccdfbcfb5ec0013294b347b4c55403d9cd7 [diff] | |
| parent | e438183d84839f5d02962770bf456f846f9645ef [diff] |
am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e438183d84839f5d02962770bf456f846f9645ef': Import translations. DO NOT MERGE