| commit | fe9d0481cb9c0b3334a7e4fb035784359fc47db3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 15:16:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 15:16:46 2015 +0000 |
| tree | 7a11bd54b53e71342aefb1150f6d4d5c72d1a488 | |
| parent | 50e2f71a5b21e0824dd9770ca1d7459d4b4587f3 [diff] | |
| parent | 15d2f9700aab91edd0050c862d6304cc4298f94a [diff] |
am 2487293c: (-s ours) am 2b8ff043: (-s ours) am 09b6969e: (-s ours) am 32e0b1df: (-s ours) am 5aaefd0a: (-s ours) Import translations. DO NOT MERGE * commit '2487293c2822c29279a6a916f5480eff38194f8f': Import translations. DO NOT MERGE