tree b200fff2914576bdb3d59836b60e90f4adb0b12b
parent d89cacb7bf1e9af8f9855f0fb0fd9774e6572179
parent 68dc050239f4d6e713e525075eb9e5c8e717de7b
author Ray Essick <essick@google.com> 1523322085 -0700
committer android-build-merger <android-build-merger@google.com> 1523322085 -0700

Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours am: 72b96b0354  -s ours" into oc-dev
am: 68dc050239

Change-Id: If6bacdfd0aa41e6fa22dfc86c90607f5f4560230