| commit | da92846bd69378713dc2cf52de95267852d6d1c2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:05:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:05:48 2014 +0000 |
| tree | 3fbda0eef41357bcc0d76406b841edfe9491d16a | |
| parent | 63c6e5c5d21688943650abda7818ea7017eabb02 [diff] | |
| parent | 520da6e491ca1559af1b5c8d672e46604b029a15 [diff] |
am 520da6e4: (-s ours) am e14c2cc1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '520da6e491ca1559af1b5c8d672e46604b029a15': Import translations. DO NOT MERGE