tree 6dc4adba0b1af2275895cc24beb516b08cb9d038
parent 39ddeae0b647519f205e8d4cc334ad548ffe2ac8
parent af83d4ecff0ad1638a1a0f3a3f9805468ed710b4
author Xavier Ducrohet <xav@android.com> 1306684797 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306684797 -0700

am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit 'af83d4ecff0ad1638a1a0f3a3f9805468ed710b4':
  Merge 2402ad60 from honeycomb-mr1. do not merge.