[automerger skipped] Test sendCaps and sendProps am: e582c5d4be -s ours
am skip reason: Change-Id Idefce1174b82668d23c53dd1bf95bc660cb21c28 with SHA-1 d5f249c24c is in history
Change-Id: Ied1f1b7f5d075ad35d361f69cc49ecb8d15a9d14
This commit is contained in: