OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)
commit5c4276a258d3c692c053ea4aed4a8233e7f5c2b5
tree4b01c64e970069dafe260aaf21d4c313d1c0e2af
parentafe5eada5bbc6d961c81e881be1f12b1bfcc83e4
parente24780ed4ca05a3adf7114bcf4a95abaccd2f317
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
am: e24780ed4c

Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1