tree f36d063dc47508a933d6f53648e46572d71fe611
parent 2f52ceef6f5a3d3df2b05169b958eba549fb52a4
parent 1c7d94f2f759a0421456cd516051d481133e3e36
author Ray Essick <essick@google.com> 1523313723 -0700
committer android-build-merger <android-build-merger@google.com> 1523313723 -0700

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

Change-Id: I8e032bcbf55d459d9d28bb762203012ace5b1e6a