tree df0aff2ccf32ae95926d1f68fbb4b859efe5540b
parent 7c526756b4da13debac872b4e3c647e94f51c78d
parent 2d6dbbac04a3f47cbdce91476337a8c7d7c0d0eb
author Annie Meng <anniemeng@google.com> 1527015720 -0700
committer android-build-merger <android-build-merger@google.com> 1527015720 -0700

Merge "Allow restore of settings with nullable components" into pi-dev
am: 2d6dbbac04

Change-Id: I28f02ff934aed4e51395c6c1692f655cf35bbbed