[automerger skipped] Merge "Fix memory leaks in Settings" into pi-dev am: be13e74deb
am: 6136194c4d -s ours
Change-Id: I5499ae3769b11cc22b68f4c1033fcff9d82b21cb
This commit is contained in:
be13e74deb
am: 6136194c4d -s ours
Change-Id: I5499ae3769b11cc22b68f4c1033fcff9d82b21cb