| commit | d15183a971590ca0e32bc78c8ed2a3470009fbae | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jun 29 17:59:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 29 17:59:04 2012 -0700 |
| tree | 634168495a83bc430947fc10c84c81826f775d4b | |
| parent | d601be8f945833ea95e6aaae769efb8ed26d964a [diff] | |
| parent | 9ca616e42520ff12de921b8c301ef4cf7cb6c95a [diff] |
am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '9ca616e42520ff12de921b8c301ef4cf7cb6c95a': Import translations. DO NOT MERGE