From: Alistair Strachan <astrachan@google.com>
Date: Thu, 27 Sep 2018 19:31:56 +0000 (-0700)
Subject: Merge commit 'e0067bdc75566629c9143818c8f3970c16c8825e'
X-Git-Url: https://git.ti.com/gitweb?p=android%2Fexternal-libkmsxx.git;a=commitdiff_plain;h=e77f68c1d7a607019f9cf36d47b8f33fcb9b7146;hp=e77f68c1d7a607019f9cf36d47b8f33fcb9b7146

Merge commit 'e0067bdc75566629c9143818c8f3970c16c8825e'

Bug: 110964307
Bug: 116741782
Signed-off-by: Alistair Strachan <astrachan@google.com>
Change-Id: I2130490f8fa61743217cbf2081640773960ea843
---