| commit | 9259ad7282c428dcdefb8f00af40529b4cbe1a95 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 20:01:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 20:01:21 2014 +0000 |
| tree | abc68aa3d37953d7109f26e98694346ea9c4236c | |
| parent | 00ba894b49d2040ca5d4478c76f4f10f4f9759f5 [diff] | |
| parent | f93c82ae366970b3c06dedf2b040d000c16d2261 [diff] |
am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f93c82ae366970b3c06dedf2b040d000c16d2261': Import translations. DO NOT MERGE