| commit | 7245900ca86ba11f1658b6b56a07b39ef3303fa9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:18:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:18:08 2015 +0000 |
| tree | 84230245b6d0620425180d5fab12ff558de999ab | |
| parent | c191e98b6b85766dd5247433ffc3b2c996fd8166 [diff] | |
| parent | 60c3268e8f5917b1d983bdcc3c6f4069377d43a1 [diff] |
am 60c3268e: (-s ours) am 0dacc415: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE * commit '60c3268e8f5917b1d983bdcc3c6f4069377d43a1':