tree 566778c064c70b0b47495e22e19f83e73200f89f
parent 3e74baeab01f875390d42418719e42bec7d8f8a4
parent 762906e33e88a9ee06a407fe21be5bad0c68ea74
author Sergio Giro <sgiro@google.com> 1450294729 +0000
committer android-build-merger <android-build-merger@google.com> 1450294729 +0000

Merge "ProviderTest: use the correct provider object when creating a service" am: 2428e4b908
am: 762906e33e

* commit '762906e33e88a9ee06a407fe21be5bad0c68ea74':
  ProviderTest: use the correct provider object when creating a service