tree d0a867b43de12362e18830aac3d70e1762a52fd6
parent 6c8ae5f9b8c58a1275645868c5f77c64f84de69b
parent 53469616152fd30daedff7905fe45b16874a128c
author Mathew Inwood <mathewi@google.com> 1533289307 -0700
committer android-build-merger <android-build-merger@google.com> 1533289307 -0700

resolve merge conflicts of 6987a91e7c73505fd8910d3d396adf76baf947e0 to stage-aosp-master
am: 5346961615

Change-Id: I2bcb356c7cbd76067202b27ec6db7f1eeef17aa3