commit | f5e9a0e8d4140e3f1ad1f77806dc50109e591c79 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:21:02 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:02 2015 +0000 |
tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
parent | dce608ccb7aa4fd63ec7b989838f2d893ebc6f2e [diff] | |
parent | e00016647ba74ca76b90c241a56a4c136624a3a6 [diff] |
am e0001664: (-s ours) am 2d37dbd0: (-s ours) Import translations. DO NOT MERGE * commit 'e00016647ba74ca76b90c241a56a4c136624a3a6':