| commit | aee73e3d114b0f030419c47827dd1b1adb73cc32 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 04 14:20:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 14:20:19 2015 +0000 |
| tree | 59a0e719c2efadb66387c2bf2bfb8760b580435a | |
| parent | 0e8baf3ca671deb81b27e84281d87b1e4928b054 [diff] | |
| parent | 116b9336e2798fdbdea1b98aa4455b485268587b [diff] |
am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE * commit '116b9336e2798fdbdea1b98aa4455b485268587b': Import translations. DO NOT MERGE