OSDN Git Service

am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make Launc...
authorAaron Whyte <awhyte@google.com>
Tue, 13 May 2014 20:36:31 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 20:36:31 +0000 (20:36 +0000)
commit8452776b950b26f86324636242dd302a596fae1d
tree3fb10f26c151c767ff771e534adfff91a9565a2d
parentcf768044cdbef02ba9c0d44f33c9f17735f91455
parent5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b
am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev

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