| commit | 15d2f9700aab91edd0050c862d6304cc4298f94a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 13:16:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 13:16:58 2015 +0000 |
| tree | d5138d7cc44a3569dbe193af5ca6757712689887 | |
| parent | 45f672cb0f25c9840fec4c09a4bdba1d93986329 [diff] | |
| parent | f5c7024d83856bc5f50006db0c36d5451edfbe9a [diff] |
am 2b8ff043: (-s ours) am 09b6969e: (-s ours) am 32e0b1df: (-s ours) am 5aaefd0a: (-s ours) Import translations. DO NOT MERGE * commit '2b8ff043bc77354d7da9dcd369ad849094a985ab': Import translations. DO NOT MERGE