| commit | 22a104d91a24f25e7ddb32eb501f157a787f39db | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:52:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:52:38 2015 +0000 |
| tree | 659340206ca2f150eda4f26b93ba91f465888027 | |
| parent | 6d85bcb3ed4cafe56135e7f8de940866cfd9922b [diff] | |
| parent | 8655be287d07e96e199502777f403bb38a766ba0 [diff] |
am 8655be28: (-s ours) am c2d8a523: (-s ours) am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE * commit '8655be287d07e96e199502777f403bb38a766ba0': Import translations. DO NOT MERGE