tree 70f9ab0d2e48f6ebf279188c60c41a928c4bb67e
parent c4c3cc2ee9f1eb359700fac6c27984fd703f830d
parent 4f2b227fae9dd6f91b276da123826b3c4d027186
author Tao Bao <tbao@google.com> 1466092400 +0000
committer android-build-merger <android-build-merger@google.com> 1466092400 +0000

Merge \\"Support wiping userdata for A/B OTA packages.\\" am: b727d5bb32
am: 4f2b227fae

Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5