tree 8ace67890eec497f859e5def1fdda99bb936861c
parent e115195b2f971879e11f26e018e49090a4877028
parent 04f16736aee603c6c5c0ffac4045aff120f8264e
author Mathew Inwood <mathewi@google.com> 1533289875 -0700
committer android-build-merger <android-build-merger@google.com> 1533289875 -0700

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

Change-Id: I056f6db65b8cadf6e4a74f3ea92183b0c6328620