tree 5666dbd5ef3bbdf04791294853332b96430836f9
parent 9f634082012c0237410f38f0563144f5583d5e0c
parent 4fd8dabd52587e117cde58b756d5ef0d9696c47f
author Andrei Onea <andreionea@google.com> 1564088353 -0700
committer android-build-merger <android-build-merger@google.com> 1564088353 -0700

[automerger skipped] resolve merge conflicts of 130e0ade7b3ed33038518c9eb8329cbee066ef2a to stage-aosp-master
am: 4fd8dabd52 -s ours
am skip reason: change_id I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4 with SHA1 df301b8887 is in history

Change-Id: I0e15d51473fdb92875e0590c6feef09c7a8a7c2d