OSDN Git Service

resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
authorTao Bao <tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000 (15:50 -0700)
committerTao Bao <tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000 (15:50 -0700)
commit4a029de94ac4424347f006010d5d2c03ba1bf485
treef32cedad74779fc32f40cc054c814f249068814c
parentbf7e78b4c191fe941abbc50238940237f2185c29
parent303a8518c1dc2adc243bb9f17cd4c41315d57ae9
resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp

Change-Id: I2c128766ccab4c21ef87b0b87c6b6a517e9280b2