tree 6a31209f50a121c1febc7f051c192c89f4dc62e8
parent a438533811e7721eb30c110f9a6b66c6a4571996
parent b840785100e220e5fbe2963ace5e4a65cac919ee
author Andreas Gampe <agampe@google.com> 1505429213 +0000
committer android-build-merger <android-build-merger@google.com> 1505429213 +0000

Merge "resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
am: b840785100

Change-Id: I5547c135edda0ba51869c7131d83dd221aa7d740