tree 413067c9e52db3b6be4af69fe1d7f3ef67b52b7e
parent 68533d70a88269b260b32199206e51d544516765
parent e5f8d62db308ecf111505eb034ce5567fe76a5d6
author Kevin Ma <kma@google.com> 1401984676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401984676 +0000

am e5f8d62d: Merge "Added watch specific themes for cts tests, to disable ActionBar." into klp-modular-dev

* commit 'e5f8d62db308ecf111505eb034ce5567fe76a5d6':
  Added watch specific themes for cts tests, to disable ActionBar.