tree 6dc4adba0b1af2275895cc24beb516b08cb9d038
parent 311f9493dfa88d455ff0ea25f86e508a6852682d
parent 228e4716278f450a95be5addacc3c6c940668493
author Xavier Ducrohet <xav@android.com> 1306684816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306684816 -0700

am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.

* commit '228e4716278f450a95be5addacc3c6c940668493':
  Merge 6103e22c from honeycomb-mr1. do not merge.