OSDN Git Service

resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73 am: 1a7379d788
authorfionaxu <fionaxu@google.com>
Mon, 18 Sep 2017 18:22:55 +0000 (18:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 18:22:55 +0000 (18:22 +0000)
commit38bd64363e9910df0080b2a4ed7d7a3f5c01c5da
treeaee2f24491d4b0a33c4a87631263135a100cdffe
parentc59951dc28ae76f5c31b243c5d7940f90517d950
parentbe4e433da20f6083f7b5d021959e16bf501e14b4
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev am: 6e40562a73 am: 1a7379d788
am: be4e433da2

Change-Id: I038f4503d1dd449c48c61785619db57e089519d7