tree b1abbdb146a03c8c77da714e3c8d058d5c4a4a48
parent c4ad4bafe1bc1c9e92be1995c288ff89eb7b191e
parent 041ee6ccda354960ebc1e1ccfff78685ec5326e1
author Ben Cheng <bccheng@android.com> 1286460899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286460899 -0700

am 041ee6cc: Add timer mode in opcontrol.

Merge commit '041ee6ccda354960ebc1e1ccfff78685ec5326e1' into gingerbread-plus-aosp

* commit '041ee6ccda354960ebc1e1ccfff78685ec5326e1':
  Add timer mode in opcontrol.