tree f3f0cc4dfc1fd0c32aee204964900997d22853ac
parent 34ef78f44f3fa6ef1b5813d4fb7896f0f90ccb4f
parent c5f84ae68a66c4416cff54f6369c31f1d0a3511e
author Android Merger <noreply-android-build-merger@google.com> 1523312872 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1523312872 +0000

Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev

* changes:
  Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours