tree 1bf2d00d56324ad56fc4f4a01f480e690f2140a7
parent 149ed5fb3c03ddfd5afce76586e05753228136f2
parent b970f6291337a06b8255d3407d561672f415cbbd
author Rubin Xu <rubinxu@google.com> 1553261267 -0700
committer android-build-merger <android-build-merger@google.com> 1553261267 -0700

Merge "Remove excess logging in secdiscard" am: b640f4e337 am: 2c1e98d69f
am: b970f62913

Change-Id: Icce53ecc1e43945cd1298edbf3e70005340432d9