tree b1bdb11def7969dab7c21eef81309f5dea0d99ea
parent 8cee535966608f63ab11fe127c9045838974e08f
parent 64b928e82a3b91b339ff9ee980c4a0c020daa251
author Andy Stadler <nobody@android.com> 1242076532 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242076532 -0700

am 64b928e: AI 148694: Manually copied from cupcake_dcm CL 148669-p9.  W

Merge commit '64b928e82a3b91b339ff9ee980c4a0c020daa251' into donut

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