| commit | 52d2a5a891c86db71f6f104d8612fd0d620dd539 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed May 30 13:03:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 30 13:03:23 2012 -0700 |
| tree | 661eced3d286507e394b01189f13da4b7a00c45b | |
| parent | be96c96f3655b603bc2ee1fc304388ec0e27344a [diff] | |
| parent | 29457a67e8a8dcd4600a4ea50a3c092a0559a962 [diff] |
am 29457a67: (-s ours) am d6bea1eb: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '29457a67e8a8dcd4600a4ea50a3c092a0559a962': Import translations. DO NOT MERGE