OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)
commitb7e254521758e3257be74b2385a65874ec8b7bda
tree9e3775de5b8bfa09a204762dbafda5ef6d0c12f0
parentd278da795238de14a7b23b132a0a2929f77e7ec6
parent3a5e567ab9c7ed23eafdadafc56a3e28f9237289
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
am: 3a5e567ab9

Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a