tree 035033a7fc4834fe2e3b04633336db85915eaee9
parent 7c7ad1a204ee19dfec54d348f5a1ad1730b6c572
parent 64c71b72ad0e56d64e72af4147231b7fe8f796ee
author Baligh Uddin <baligh@google.com> 1442957124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442957124 +0000

am 64c71b72: am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev

* commit '64c71b72ad0e56d64e72af4147231b7fe8f796ee':
  Enforce a timeout for Content Providers to be published.