| commit | ab64e078188f0e728f6b09236166d17f0b156b0c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 16:38:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 16:38:41 2014 +0000 |
| tree | 7654f4e4984640c745fbceadd6eeb775bcb7d39a | |
| parent | a438f67d27c624dd3150b352726c6a203d091e2f [diff] | |
| parent | 8f515936323b83ef96701a1eeca895cd76fd3f4c [diff] |
am 8f515936: (-s ours) am 91ca496c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '8f515936323b83ef96701a1eeca895cd76fd3f4c': Import translations. DO NOT MERGE