tree a2caadb709ed1b0691054da9bed5e4dd456bc905
parent 0371d71029b232f01ef85a9bf4d9cd3c3df95a6a
parent 079f6d7fa68e5640081bfb21fe8e05fa93307447
author Makoto Onuki <omakoto@google.com> 1527853568 -0700
committer android-build-merger <android-build-merger@google.com> 1527853568 -0700

Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
am: 079f6d7fa6

Change-Id: I299267e20b78810002bab56488b9436456936d11