| commit | 372bcde7ba3f2e003c7178d591d451ef83d93b93 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Dec 17 23:46:13 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:46:13 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 97f84a7cf812967e0d7452514a885f160e1a31ec [diff] | |
| parent | aedd525a432bb7ecb0aeaed43c79b6d437117c42 [diff] |
am aedd525a: (-s ours) am e24a090e: (-s ours) am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'aedd525a432bb7ecb0aeaed43c79b6d437117c42':