| commit | c9f2387a75d1e1309c3e16ce653a620b1aee0c33 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 13:50:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 13:50:04 2015 +0000 |
| tree | 20db03caf89960458504d9e2d5b0938e99550084 | |
| parent | 27960806a3a5aa9caf0d6dfb20ef5a2046bba13e [diff] | |
| parent | 6aefd8d2cb2476b968687f9c1cf48f9b99390f67 [diff] |
am 6aefd8d2: (-s ours) am a7e9bc63: (-s ours) Import translations. DO NOT MERGE * commit '6aefd8d2cb2476b968687f9c1cf48f9b99390f67': Import translations. DO NOT MERGE