OSDN Git Service

resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73
authorfionaxu <fionaxu@google.com>
Mon, 18 Sep 2017 18:14:50 +0000 (18:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 18:14:50 +0000 (18:14 +0000)
commitbe4e433da20f6083f7b5d021959e16bf501e14b4
tree509f15ba3958c0f3ca800945c2b714b1ac53472e
parent57a1d7a669261fa67b2a4549a00b7891150c6fd1
parent1a7379d788b670d73fe8625b8d574e982f5d95d7
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73
am: 1a7379d788

Change-Id: I7c3afba872aa8bcc13c5bbe39f91e50a3c02efe1