tree 0da9c9bee25980942a130d7a3391e69f78b58410
parent e034a1f5eda4c4feda610e5d68989bcc5f113997
parent 0ddaa63b6716d40b1d7988e9e224c31472a0d633
author Phil Weaver <pweaver@google.com> 1504134603 +0000
committer android-build-merger <android-build-merger@google.com> 1504134603 +0000

Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67  -s ours

Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b