tree ac6374f7fd42daaab9202fd5f3ba0be526cfbcb3
parent ff104b7792b628f56205a821a873d3756c18f14c
parent 0fa2574ecb2dbc2258065d4803afc35c2474c346
author Dianne Hackborn <hackbod@google.com> 1492803147 +0000
committer android-build-merger <android-build-merger@google.com> 1492803147 +0000

Merge "Fix issue #32180780: Sync adapters inappropriately being run..." into oc-dev
am: 0fa2574ecb

Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c