| commit | 17ea9d250ca50ff6a9892625930cb93f7b2294ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 28 07:11:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:11:10 2014 +0000 |
| tree | 8c87a58b0decdea38a7dbb732f5209e589f0f626 | |
| parent | 10af602941a93f1cbd808f080c9fd223d8cd6924 [diff] | |
| parent | 076e9841dc30866e802ac9142fa2f9961bf536c7 [diff] |
am 076e9841: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '076e9841dc30866e802ac9142fa2f9961bf536c7': Import translations. DO NOT MERGE