Andrew Sapperstein da26da973b resolve merge conflicts of 83b1a18 to master ...

Change-Id: Ibbb4f9cff0224fb4ca3607f60a4ed9d6fafe8216

2016-06-21 13:56:01 -07:00

..

java

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

2016-06-21 19:38:50 +00:00

jni

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

2016-06-21 19:38:50 +00:00

res

resolve merge conflicts of 83b1a18 to master

2016-06-21 13:56:01 -07:00

tests

Merge "Fix the handling of bundle array in RestrictionsManager"

2016-06-21 09:14:48 +00:00