tree c1c85f0fd63008bbbe30afc4ea0e7b25fcd79219
parent 9fad6d289a65232db252d5ce40cc718c18a793d6
parent 632def142d004f8d69e97a650f38c60892396302
author TreeHugger Robot <treehugger-gerrit@google.com> 1517592101 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517592101 +0000

Merge changes I25ebbcb3,Ic4439e0e

* changes:
  Switch SliceManager IContentProvider to ContentProviderClient
  Add backup/restore for slices access