| commit | 4a6e09e606970a150bf54e3f3dfcb23145444fe0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:24 2015 +0000 |
| tree | 4842e0c15372ba4f73bc82ac0fe7b98b9350b5a8 | |
| parent | 4c0c1b47e8f4fafc005509466fe283446ee85d9c [diff] | |
| parent | e892da51c8aa3965adf16f48d4f1cdce14923125 [diff] |
am e892da51: (-s ours) am 291a8de4: (-s ours) am 5b36696e: (-s ours) am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE * commit 'e892da51c8aa3965adf16f48d4f1cdce14923125': Import translations. DO NOT MERGE