| commit | 09ecd7e2dc9b5fba8aeae9c31bd7638732a10cfc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 02 10:46:40 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 02 10:46:40 2013 -0800 |
| tree | 7696c758619d8863c08cceb57bb25be52a90a74e | |
| parent | 4f43824b04223d3958efa757014b4c29044aae55 [diff] | |
| parent | d229620e8e9843227ade580e4e1b8913e7e18b24 [diff] |
am d229620e: (-s ours) am 8d49b29d: (-s ours) Import translations. DO NOT MERGE * commit 'd229620e8e9843227ade580e4e1b8913e7e18b24': Import translations. DO NOT MERGE