| commit | 7f2116d1dbe1099fc44c0ad57cd5efdc4a9583d9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 15:25:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 15:25:44 2014 +0000 |
| tree | 4182d6fb811b8ce0c589c32b66d97c946b8ea617 | |
| parent | ea964156460bbe8ab8f03c8de5f9f529234d69ce [diff] | |
| parent | 301a617698e74bb413df52f93ea7908a33423250 [diff] |
am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '301a617698e74bb413df52f93ea7908a33423250': Import translations. DO NOT MERGE