tree 75c245f4593bf3c8198c604ea70d858251f5d02b
parent 7a0c2ecf3dadd261139c36479d7bbaa34d1b20c5
parent d9b91fca26c3f209aac9c9451be0a72309a95d77
author Robert Berry <robertberry@google.com> 1522323059 +0000
committer android-build-merger <android-build-merger@google.com> 1522323059 +0000

Merge "Persist KeyChainSnapshot to XML" into pi-dev am: 9f75e089ed
am: d9b91fca26

Change-Id: I74aee2c0e1c7eda412a31f1bcd7cf2b13ac2190f