| commit | 5b36696e4280db82808a190dcd22cc1789ab991a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:59:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:59:45 2015 +0000 |
| tree | b0ca648077bbed74d58756688dc1eb3d22e236c2 | |
| parent | 98aa99f778f5a9d07e04713aa23548127586c740 [diff] | |
| parent | 0b5686918ec2ba3dfd2d6b1ec2081ac28f70d66f [diff] |
am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE * commit '0b5686918ec2ba3dfd2d6b1ec2081ac28f70d66f': Import translations. DO NOT MERGE