tree e1ffdc0208cbcd13fc2da76af7a0e3ddb9c397d2
parent 040567434ec33763854025e84b219404b303264b
author Tao Bao <tbao@google.com> 1533752354 -0700
committer android-build-merger <android-build-merger@google.com> 1533752354 -0700

Merge "Merge libsync_recovery rules into libsync." am: 8fa3adb8a9
am: db291b5fb4

Change-Id: Idd667acedda968bb1f6e1528df0d6feb3912e427
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: d631f77cbeb96ca5a120e6c75f9e948b0be6d5f2