tree 08de6bc357514457afafd4c5a6ce181697410df8
parent 5033cbc7b0534ce917df8da2e7a30ef4d9b605b3
parent 5d24c2c214be9776d4da3c7638515dda55b7b21e
author Jordan Liu <jminjie@google.com> 1497054649 +0000
committer android-build-merger <android-build-merger@google.com> 1497054649 +0000

Fix merge conflict from oc-dr1-dev to oc-dr1-dev-plus-aosp
am: 5d24c2c214

Change-Id: Id61ffda92b0b9b65214c143fdff16e7026ac1072