tree 6a3c076ef8f922e6dfe38191faaf573001d765d1
parent ccf51bef288652cb618a566a376173e252b84af0
parent ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa
author Griff Hazen <griff@google.com> 1400640256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400640256 +0000

am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev

* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions