tree 98ee3ae09aceb4242820ef3b160a4ea95dc464bc
parent fef4764ef018dcc5fad54d1cd43da5e3e8444edc
parent 9f75e089ed76e0cb8e2e0aa147767cb8afdba484
author Robert Berry <robertberry@google.com> 1522322258 +0000
committer android-build-merger <android-build-merger@google.com> 1522322258 +0000

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

Change-Id: Ic0570155bba210a0bffa2e813724cbd13225dddc