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