tree a9e1cd6003e9d7523f80d390bd3019386b448ac4
parent b3aeb3ec4f7ed3d526a807807ca43f4e6d13a3ee
parent cfb917770a063174dc188c28200d31c206e0bbfc
author Katie McCormick <kmccormick@google.com> 1304549513 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304549513 -0700

am cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340

* commit 'cfb917770a063174dc188c28200d31c206e0bbfc':
  Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340