tree eca88e5d4bfed8012b44e1e1b107b7f71247826b
parent 58bfed927de858757e40195c1a77d2a9f385ff91
parent 8452776b950b26f86324636242dd302a596fae1d
author Aaron Whyte <awhyte@google.com> 1400013698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400013698 +0000

am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev

* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859