OSDN Git Service

[automerger skipped] Merge "Modified MultiSim APIs" am: c5461c4490 am: be4d9657a7
authorMichele Berionne <mberionne@google.com>
Thu, 21 Mar 2019 19:41:15 +0000 (12:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Mar 2019 19:41:15 +0000 (12:41 -0700)
commit1d92c9b8266faabc63be2e10c1a1922e754a2294
tree46bb2837ec9be09035dc254c5e2460a4d2cd0e51
parente05cda0916ffb8a49aad4f33cc7ff2a6f3736865
parent296e21451d02aaf758d75db11e0fbbc4a6a9cb4a
[automerger skipped] Merge "Modified MultiSim APIs" am: c5461c4490 am: be4d9657a7
am: 296e21451d -s ours
am skip reason: change_id Icbd36f714c577a965d39336d54d7224c8c2c7cd2 with SHA1 6e1c1094d8 is in history

Change-Id: I7ef210ecfc9ec21bf5f4eac51d85e43fc6269809