tree ce61784ef50667d4fabfb233fe1bd5c669b09b54
parent 12b381ea5e42ebdb8feda1dc1e366c06da44c7da
parent 012bb4d4e59e50f39fd199db89b4a4be93c7ad50
author Jean-Michel Trivi <jmtrivi@google.com> 1250103880 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250103880 -0700

am eccd6fdd: Merge change 20673 into donut

Merge commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc'

* commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc':
  Fix bug 2043140.