tree efde6d771536c6214468b2ada9b80370fd29c9b7
parent 8e43add42ed93ef70b3be0934c4557705c02e20b
parent b959d3dcfec9eed5d0f24389dca10bdd76a8332d
author Michael Jurka <mikejurka@google.com> 1296782166 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296782166 -0800

am b959d3dc: am a7f801fc: Oops, forgot a cast. :(

* commit 'b959d3dcfec9eed5d0f24389dca10bdd76a8332d':
  Oops, forgot a cast. :(