OSDN Git Service

resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
authorfionaxu <fionaxu@google.com>
Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)
commit0318d4ec91271597edaa4d40e45ed99ed5e9f769
treee96fcf94eaa893e58a63758f876dffac169371fe
parentcf6a6d244e119fa91a63d991635c37c3a5714085
parent6e40562a7388a33372b6244462aa86aabaa966c2
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
am: 6e40562a73  -s ours

Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7