OSDN Git Service

resolve merge conflicts of bd963b08 to oc-dr1-dev-plus-aosp
authorJin Qian <jinqian@google.com>
Fri, 21 Jul 2017 22:42:20 +0000 (22:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Jul 2017 22:42:20 +0000 (22:42 +0000)
am: b52717767e

Change-Id: Iba0e28cec12c5c92dd0037bd34253dda545f5d8f


Trivial merge