| commit | 3d1c36f32f3de99a2da724f295120053a26624c8 | [log] [tgz] |
|---|---|---|
| author | Huahui Wu <hwu@google.com> | Wed Apr 21 11:14:02 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 11:14:02 2010 -0700 |
| tree | 4be2cd9834a3a910da7a37c7f28b940d808e64e4 | |
| parent | 53fa936a8f0b1fbf48b377b6f018bfc7fdf034cb [diff] | |
| parent | 10034867ab38576d45a2450acc0a56388ca4c64a [diff] |
am 10034867: (-s ours) DO NOT MERGE