tree 2aa2cb6936c908494527967d2b865eaf6392b787
parent fd5101dc6a2c0bd2e4235ab9d329baad2bc4eaf4
parent 9b1d182b5d5de326a3a9ba9e0c8e8014f1c62774
author Katie McCormick <kmccormick@google.com> 1304549230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304549230 -0700

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

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