commit 7fc94d02ca31cd7a7972e3f9a852f40c07caafb5
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Apr 09 22:49:06 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 22:49:06 2018 +0000
tree 60d198c6bc42d67433853e97c225e2af7a0ad4bc
parent 51fa4a4cc99f059595497944af46f0fe7c7c04af
parent 13add74a8ee3788246aa655f7455a778a3c02aca

Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev

* changes:
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d am: d23573db37
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49
  [automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3 skipped: 9b1b7bc603
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e
  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