[automerger skipped] Merge "Add isSliceable API to BasePrefController" into pi-dev am: ef950c24bd

am: 0cf8b408f9  -s ours

Change-Id: I01a7cd3c08acb13773cd920bc95d5f1dbbdc9297
This commit is contained in:
Matthew Fritze
2018-05-23 11:25:35 -07:00
committed by android-build-merger

Diff Content Not Available