tree 7e0ddbdb90bdf72cf1d4cf40b173fb390f264ec9
parent e1037f5c3d25f1572ca4da3a9f96e62cf17ccd06
parent 79a4153198c3db73071aba2037217305e4dde7c4
author Daniel Xie <dxie@google.com> 1445035785 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445035785 +0000

am 79a41531: Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore Illeg

* commit '79a4153198c3db73071aba2037217305e4dde7c4':
  In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so ignore IllegalArgumentException from unregisterReceiver.