| commit | 13cd0b25734e215f3369b0c5367dafdc74c070da | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 03:13:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 03:13:06 2015 +0000 |
| tree | 40984e6ea98a21acd380f1c567b92ce3b596f1c2 | |
| parent | cb113be57e3eb49871c77ce5317d644963e033af [diff] | |
| parent | f305e853a97be420eca536a510d8dca1c9877ef9 [diff] |
am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE * commit 'f305e853a97be420eca536a510d8dca1c9877ef9': Import translations. DO NOT MERGE