tree 6939079c4f9b7492a72bed2aae06403124d496bd
parent 1324d5b32c5833d1dcc8f8e5c5a29cfcf4535417
parent 657c80b146f8d6319bf059f4aea2fce3b15a50b6
author Android (Google) Code Review <android-gerrit@google.com> 1244820291 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1244820291 -0700

am 657c80b1: (-s ours) Merge change 3775 into donut

Merge commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6'

* commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6':
  DO NOT MERGE.