tree d44fd39df1b1ec54a758670de456177d7256b8ab
parent 9402bb4994c077eee5abaabd6b914d4d04c64b09
parent 70ee016e21bbe9fd7acbd8e65a1a8c295ae323b0
author Andreas Gampe <agampe@google.com> 1504194683 +0000
committer android-build-merger <android-build-merger@google.com> 1504194683 +0000

Merge "Merge changes I49057737,I68e3096d am: 50cf621704 am: f5dcc28b0c am: 30348a8abb" into oc-mr1-dev-plus-aosp
am: 70ee016e21  -s ours

Change-Id: I8a8444eda25dc9f0341b7b82917fa71d88799b79