tree bf9ceeac3814d10936174d73ee85b586b633095e
parent a8faf91fa558be1235d508e776eb24be4429585c
parent d4e03f37423bee383d17f7292753a5f67e497a28
author Mathias Agopian <mathias@google.com> 1287094636 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287094636 -0700

am d4e03f37: addresses parts of 3096779 and 3097475

Merge commit 'd4e03f37423bee383d17f7292753a5f67e497a28' into gingerbread-plus-aosp

* commit 'd4e03f37423bee383d17f7292753a5f67e497a28':
  addresses parts of 3096779 and 3097475