commit | e6f65c0d0a28ae72322392c90525f8f705b839e4 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:05 2015 +0000 |
tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
parent | 7b21fc5bd61489b404fc0eb8cdd57e2368d33fa2 [diff] | |
parent | cf090fc76ebdb15d4049288e78067fe57844c637 [diff] |
am cf090fc7: (-s ours) am 68c112b6: (-s ours) am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'cf090fc76ebdb15d4049288e78067fe57844c637': Import translations. DO NOT MERGE