tree a7c20ed623121d22cfe3e10c24d126264b1cf65a
parent a6d225aa50e194c9a06aa1b4f3b6ae44bd87dc2e
parent a97ee07a5cc03caa7420cdb7a80daaa0a30dc2d9
author Dianne Hackborn <hackbod@google.com> 1492803718 +0000
committer android-build-merger <android-build-merger@google.com> 1492803718 +0000

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

Change-Id: I6c938e3c64e7b584dd5f4262646daa3677551f91