tree 931aa9ed472a387d973e2b0feae39d106612e8a1
parent f7c7853209c65e6443ea4f87827637b0844933df
parent 65c93572b38864dc6fb22ec45a2b8f5f6f112eff
author Jordan Liu <jminjie@google.com> 1492468428 +0000
committer android-build-merger <android-build-merger@google.com> 1492468428 +0000

resolve merge conflicts of 1b886a1 to oc-dev-plus-aosp
am: 65c93572b3  -s ours

Change-Id: I444b3ee6a83d8522c44bd2d45ce49f839f51a99c