tree b542dffb1f8c45a5a783a6d12e6b1e7295e19509
parent f7ed3a2b0fd00c517671cc986b4b44d29b60ac28
parent b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb
author Andreas Huber <andih@google.com> 1261074468 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261074468 -0800

am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2

Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'

* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
  Squashed commit of the following: