commit | 3ea647bcdcde4e0dde851a2e55a8f7b18608b4fb | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 19 13:21:41 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 13:21:41 2015 +0000 |
tree | 65f3c0ec5b54cd38993cf2c7fb9d9f0d01db5189 | |
parent | 36d2b3faa93066d6d5379b9536d72ffb541ceaca [diff] | |
parent | 1c95645b3bbc55db50d5720e29a2b867d849d0f8 [diff] |
am 1c95645b: (-s ours) am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours * commit '1c95645b3bbc55db50d5720e29a2b867d849d0f8': Import translations. DO NOT MERGE