commit | 9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:05:46 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:05:46 2011 -0700 |
tree | c5b225b259b07a14187c812f346d38967b683ad2 | |
parent | 20ad95532476bad17bbef8d406814b06f3d7fcf1 [diff] | |
parent | b7b877a45f469336703844a928482e6438442567 [diff] |
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge. * commit 'b7b877a45f469336703844a928482e6438442567': Merge 9d76581f from honeycomb. do not merge.