tree daa41f4d426d43d68d76ced80f750e4dae9363c6
parent 1dffcfdd7ba0e1fd04d2b650985a3a5c8b9e54ce
parent 5f9afa968dcb2477a992c4a95a898bca71b16c46
author Dianne Hackborn <hackbod@google.com> 1466537251 +0000
committer android-build-merger <android-build-merger@google.com> 1466537251 +0000

Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
am: 5f9afa968d

Change-Id: I7ca258416372dd251759aa920f51c2486d432f9c