Andreas Gampe 14e3e529f8 Merge "resolve merge conflicts of eb8a4ef5d3 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp ...

am: b840785100

Change-Id: I5547c135edda0ba51869c7131d83dd221aa7d740

2017-09-14 22:46:53 +00:00

..

android

Merge "resolve merge conflicts of eb8a4ef5d3 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

2017-09-14 22:46:53 +00:00

google/android

…