| commit | e60b2a7831e85ebc366f2fa82470fffc814825e4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 26 02:54:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 02:54:13 2015 +0000 |
| tree | 0af74e9f585ff7ffe64c19634019105808e4aa50 | |
| parent | 62cc586ec1720a343ca3dc1d2f3f64395ab56087 [diff] | |
| parent | 4649c7bcccb953cd7b5cf350b98841c7d7591651 [diff] |
am 4649c7bc: (-s ours) am 22c0a189: (-s ours) Import translations. DO NOT MERGE * commit '4649c7bcccb953cd7b5cf350b98841c7d7591651':