tree f997ea48f9a576dd9e61b8ad98c420694147a96c
parent 9acdceb098d9133d0c0c941e1d207cf7e1a5cc18
parent 106ab9f9e1cb6c561550baed9449d1615c98feb0
author Android (Google) Code Review <android-gerrit@google.com> 1243885377 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243885377 -0700

am ff0d9147: Merge change 2766 into donut

Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'

* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
  Manually merge a few fixes from cupcake and cupcake_dcm.