commit | 152d2acfd9b9254c725eaadf53ae148b44cf9397 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 30 14:04:05 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:04:05 2013 -0700 |
tree | a2f26d751e9852a58da834e7238f4d0cd6601554 | |
parent | a3d0f0c807f7d0d199567176c8b82afd7a22d387 [diff] | |
parent | 8448c8f65b6f12c9e20e264cf124f8a398cf0b80 [diff] |
am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '8448c8f65b6f12c9e20e264cf124f8a398cf0b80':