| commit | ed28a85b51c49da3f85271e08f7c11189aef5076 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:13:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:13:23 2015 +0000 |
| tree | 3c6464ae8d3fd13dc0a7308f52aa45c7a580555c | |
| parent | ab04dcca654c7abac3f8ee120818780589c40d40 [diff] | |
| parent | 4462e18cfde491c54a8affa2898152b2ff5321d4 [diff] |
am 4462e18c: (-s ours) am 6288ecba: (-s ours) am 682147bb: (-s ours) am 7d3471a3: (-s ours) Import translations. DO NOT MERGE * commit '4462e18cfde491c54a8affa2898152b2ff5321d4': Import translations. DO NOT MERGE