commit | 5d86c201f427b6c0e13e81683ed8192870d5ae0f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:40:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:40:46 2014 +0000 |
tree | 7cdc75352d962379cacc969303b930426ccd78ac | |
parent | 76f6b825dc20f08ab138f0364bea115eadcc245b [diff] | |
parent | 0e6f9d39ed4a68a26e51447e2b5c8538e5fc342d [diff] |
am c95b0904: (-s ours) am 1a6aa4e7: (-s ours) Import translations. DO NOT MERGE * commit 'c95b0904c0da1a3bb4225a33149480e023f2752c': Import translations. DO NOT MERGE