tree 3674bb5db0b971d5a7043409ab1ab9e8d4ce6338
parent 9225dfa70c19e695d75599f8f8dcb9605ea6e039
parent b203a57d1f00fe509e0d065cd928099bb7d19d87
author Android (Google) Code Review <android-gerrit@google.com> 1248995145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248995145 -0700

am b203a57d: Merge change 9114 into donut

Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87'

* commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87':
  Add state saving mechanism to support proc restart