tree 19ff7731240b57898f84b1788c57fb0f6e7cddb1
parent 1e94de9f1662fa20981983c9f2d30b85da5e94c4
parent 08eacd482ca9988b021a9e9e6c8bec573d6e4057
author Andy Stadler <nobody@android.com> 1242076870 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242076870 -0700

am 08eacd4: am 64b928e: AI 148694: Manually copied from cupcake_dcm CL 1

Merge commit '08eacd482ca9988b021a9e9e6c8bec573d6e4057'

* commit '08eacd482ca9988b021a9e9e6c8bec573d6e4057':
  AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  When resetting the