| commit | ce0d8fd73416b114830a86b0f80a38ec24831bc2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat May 02 04:42:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 02 04:42:06 2015 +0000 |
| tree | eff06c682c4eef89ba2315e3e99c8457200a68a1 | |
| parent | aab33b0240b08f3015baf5e1b1c1955b3b56067c [diff] | |
| parent | b0cad48564ae694bddd63f27c615658be8d5bf04 [diff] |
am e8681339: (-s ours) am 1bd66aca: (-s ours) Import translations. DO NOT MERGE * commit 'e868133906cb3ee754e53923f8d06a23c9d05cf0': Import translations. DO NOT MERGE