OSDN Git Service

resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev am...
authorHansong Zhang <hsz@google.com>
Sat, 2 Feb 2019 04:58:12 +0000 (20:58 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Feb 2019 04:58:12 +0000 (20:58 -0800)
commit315dd930454ddf0d1d0dc1fccdc5513015e3590e
tree4d6b2b2812db5fa7e74fe797de4465277d821c3b
parent99a3b2d29e7e054023256d7eb62bd70729210fd6
parent35cfa7f0e3f204c4fcf32508f7724aa443629d89
resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev am: 6c0f22f324
am: 35cfa7f0e3

Change-Id: I0c7ae0e569ac0792f5a46ab59b76ba59501a98d7