tree 5b54d8e8f238854952584bd28a93e03bed4bca97
parent 6bc89a41fab2e8c35ea2d122f0dd9dde39597643
parent 5bfd33d39f7503a3f0856d30b2c51274c923f1b4
author Phil Weaver <pweaver@google.com> 1504201084 +0000
committer android-build-merger <android-build-merger@google.com> 1504201084 +0000

Backport overlay security fix am: bb1948fe1a
am: 5bfd33d39f  -s ours

Change-Id: If9ab3556158edbb0b49c34b250e47405db7faf3c