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)
commit9ffe54073ddad2be309ccd81567341e8a85b40c9
tree3d9f66a18571d0d1b8fa662ae496f4442f5544b0
parent3d37780d14d3a9c825fd2c7adc357f319293c386
parentb52717767e4659680d5354c4d4c947b3470d53ac
resolve merge conflicts of bd963b08 to oc-dr1-dev-plus-aosp
am: b52717767e

Change-Id: Iba0e28cec12c5c92dd0037bd34253dda545f5d8f