| commit | e24a090ec6945a94525765aaef6706898df586f5 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Jul 30 15:10:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 30 15:10:57 2012 -0700 |
| tree | efb161e1e2de4e55613c44cac1875eb5cb019e61 | |
| parent | 27a2c8495816553cbbf120af8096b9e9f01ed11c [diff] | |
| parent | 4522858dad073cbf19829d25ecb35e9a54f6fef5 [diff] |
am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '4522858dad073cbf19829d25ecb35e9a54f6fef5': Import translations. DO NOT MERGE