tree d044ff51083521902835fa535988d17f1761a966
parent d174fbb014a5621ae8a3e825e4e23ddb0c64e945
parent 32ef039a398b7d64f792bc90e9e28a0929c3d6aa
author Julien Desprez <jdesprez@google.com> 1549424828 -0800
committer android-build-merger <android-build-merger@google.com> 1549424828 -0800

[automerger skipped] Merge "Manifest has several instrumentation, avoid the conflict" into pie-cts-dev
am: 32ef039a39 -s ours
am skip reason: change_id Icbe2cff4d6e6ee825174cf99ee2a6894e4df6249 with SHA1 de61aaa07b is in history

Change-Id: I1f41542172359d3190192b75beb8ad1e8be0a7d2