OSDN Git Service

resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp
authorTobias Thierer <tobiast@google.com>
Thu, 19 Oct 2017 17:10:40 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 17:10:40 +0000 (17:10 +0000)
commit6ac1763521c0d2c4380b6907de51c1ef051734cc
tree44d8c4c467bf4a26fba82fb6956c8d7057da6c44
parent8cb2dcf08184c32d00e2f40cba9666f6eab80970
parent301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8
resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp
am: 301bf35e2d  -s ours

Change-Id: I94dc1b71d6c9a323173b75b2d71b7da841c460d9