[automerger skipped] Change parameter in log to array of pair. am: 82a36ec1 -s ours
am: 43bc59e4 -s ours
am skip reason: change_id Iae33b1543f81fdc68ee20588f705f03204c14502 with SHA1 b7775e55 is in history
Change-Id: Iaf46cc1799399a5e76589bd2662da7f8100dd8da