| commit | 2b1aca5c3359d55f39a657851b77581e4b3696c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 11 00:21:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:21:58 2014 +0000 |
| tree | a2b061b71e5b5f58adc60bff2fe25e29da417a49 | |
| parent | 836c77e18dc374c11275f6cea6ccee482a27aaa4 [diff] | |
| parent | bf9b40ba3556f54fa9ef91b406a413aad8e9faab [diff] |
am 64414f49: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '64414f49d2bf2858bbf7c2cb4c721ff0914da137': Import translations. DO NOT MERGE