tree febe8efb7f6c27015b78a461ba0a8c86abdfdc21
parent f90b5b0d5c1173661478b6f796e801b41ec814ca
parent aee28fd42f2db33ff6b8c27335c009523ed6c238
author Ruslan Tkhakokhov <rthakohov@google.com> 1550490117 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1550490117 +0000

Merge "Use new manifest flag to gate clearing data during restore"