tree 6ca802aae3c02db8570c457c25499c0447311f1f
parent a72923639900b811086475bbab562a93a388f632
parent a8e0d5f73a6c8e144dee5f1b0ac9e3323163ce36
author Suprabh Shukla <suprabh@google.com> 1505077256 +0000
committer android-build-merger <android-build-merger@google.com> 1505077256 +0000

Merge "Clearing up invalid entries when SyncStorageEngine starts" into nyc-dev am: fc9e382229 am: 7d9e844124 am: 25ec24740b am: 4f31a88d4b am: bf1b7e9030  -s ours am: 84aa3f4c81  -s ours
am: a8e0d5f73a  -s ours

Change-Id: I34f6294cfa3d9e23bfe9b3f0edfb03da4fd5dfd2