tree 77adda172e3e0e3380715abc51642794808aa784
parent ccf1629a8b95ad68efb67406ecbac87b81e87b1d
parent 6bb5bf6108c36cf17f18d2d7b1c01ad5f8e9be42
author Elliott Hughes <enh@google.com> 1347415277 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347415277 -0700

am 6bb5bf61: Merge "Add watchdog.h"

* commit '6bb5bf6108c36cf17f18d2d7b1c01ad5f8e9be42':
  Add watchdog.h