tree ea72d6c9a6f5f16906561b512040b1d1ff17dca0
parent 94723401bdfaf2d1a5c792654fe18d7f6d21607e
parent 3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e
author Justin Koh <justinkoh@google.com> 1398186416 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398186416 +0000

am 3b9a3cc0: Update GlobalActions for watches.

* commit '3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e':
  Update GlobalActions for watches.