tree fa3b412b8c5f58fc596e1abf3b1041b5713a526a
parent 84a3971340ce80aee47951ebea5bbde8fd10c81a
parent ca7b80e431fe8c742d396e84722eaf2f6b70a4d8
author Android (Google) Code Review <android-gerrit@google.com> 1244646080 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244646080 -0700

Merge change 2411 into donut

* changes:
  Manual merge from cupcake_dcm. Need to be reviewed by enf.