tree 3cfc405f22847ea44743da0c9a343404ecde7883
parent b27a56cf6f0d0911a1246885a2fe2fe23f5f271c
parent 7a92b9afdbac773ff21f454b7a8858f004d69b49
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1523314824 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1523314824 +0000

[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb

Change-Id: Ib0b195b2f7635d26d467eb8a5669476cb21bc9a4