| commit | 3963b980bebacb58dd2ed57fd45b042a01f125a0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 12:51:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 12:51:18 2015 +0000 |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | 45335b0c5eeaeb068af6c35bcaa25b08cf10db9d [diff] | |
| parent | 793b2a2d444192ee587a643c88e535ebf0c98158 [diff] |
am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE * commit '793b2a2d444192ee587a643c88e535ebf0c98158': Import translations. DO NOT MERGE