tree cf510bb67a998133391fc2f469329e494e76924d
parent 405cb57019e0b0b9c2049c2b06537c0f4981fc37
parent 48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae
author Xavier Ducrohet <xav@android.com> 1300214221 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300214221 -0700

am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread

* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
  Merge 6f2fb570 from honeycomb. do not merge.