OSDN Git Service

resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master am: 619e5c8ecc
authorfionaxu <fionaxu@google.com>
Thu, 7 Sep 2017 08:24:55 +0000 (08:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Sep 2017 08:24:55 +0000 (08:24 +0000)
commite7644a022c104c960c98883435dc727a273c2d91
tree4a205b7ef44b8806562e0564d8c83a61d2c5ada7
parent845c0cf812d9dd0ae950abe14e32e58a0c6bec0a
parentc0d6acf08cfca85838483689cbdbf3909b121894
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master am: 619e5c8ecc
am: c0d6acf08c  -s ours

Change-Id: Ic2110b1e658b345c9712f92411159fa9a059c4e9