tree a261cac5a69ebbc5cf717395918b6e0cdf6cd0be
parent bbe85a84bc4bd354efa28ee2853a869d2584b59c
parent e2ac5a6dfa788adab74f22862f99c677af9d47be
author Xavier Ducrohet <xav@android.com> 1306169561 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306169561 -0700

am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
  Merge 2fae858d from Honeycomb-mr1. do not merge.