tree 5da63432505062fee1e25a02e48dbc6638b70b16
parent 2ee64e2f8d3386b7b1f4e12808c6973d9b55a1ed
parent 426516cdee20f5245eaf9956adf9eccec1012fda
author Matthew Campbell <matthewca@google.com> 1510949006 +0000
committer android-build-merger <android-build-merger@google.com> 1510949006 +0000

Merge changes I452e051c,If35ceac5 into oreo-cts-dev
am: 426516cdee

Change-Id: I7ff86dd7d9aabbd8bae5a775c02906fd7d2928e1