| commit | 0736ee2631372a930f9b3c2919ef3b893ce8918a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:43:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 14:43:49 2014 +0000 |
| tree | 4182d6fb811b8ce0c589c32b66d97c946b8ea617 | |
| parent | 06b284f22b51cb27ecad920ee1fa11806e45d935 [diff] | |
| parent | 0c8802bb3ee36247f92300a1bed2ead77c436479 [diff] |
am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '0c8802bb3ee36247f92300a1bed2ead77c436479': Import translations. DO NOT MERGE