tree b200fff2914576bdb3d59836b60e90f4adb0b12b
parent e9a9daa81ac49288b3304a48ea907ee7fc160a21
parent 81c482bdd40f97ca63ba7e84331f26ab36d089ea
author Ray Essick <essick@google.com> 1523318624 -0700
committer android-build-merger <android-build-merger@google.com> 1523318624 -0700

[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours
am: 81c482bdd4

Change-Id: I7972a70982b229d91cd168b07fb4ae6102dd5cf9