| commit | 8f515936323b83ef96701a1eeca895cd76fd3f4c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 15:00:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 15:00:58 2014 +0000 |
| tree | 42b747cf4799d9b41378afa1dfb9879bb00ed2c7 | |
| parent | 9108696f95e4fe53054c4c1ca196ded764ab7e31 [diff] | |
| parent | 91ca496c2ec5b236f98126712861e38b5d839c38 [diff] |
am 91ca496c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '91ca496c2ec5b236f98126712861e38b5d839c38': Import translations. DO NOT MERGE