tree 5dcabb377910657e9caaa18c90b41b63951005da
parent 5a07832cf6e7422cc8d9a0cef533683f8357d80c
parent 2c4fad14fca7698fb197be1f20632e0ff70b5163
author Amith Yamasani <yamasani@google.com> 1399091538 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399091538 +0000

am 2c4fad14: Merge "Watch for profile events and reload" into ub-now-nova

* commit '2c4fad14fca7698fb197be1f20632e0ff70b5163':
  Watch for profile events and reload