tree 20ec0140d5e2fd9d4b53978738fcd27bab03bd1d
parent 47dceea7d85fce9636f5cdf1267ff5acd9db5a1c
parent 08e080c31434a2ed6c4863b0e1af69c1ced0a4da
author Mathew Inwood <mathewi@google.com> 1533231444 -0700
committer android-build-merger <android-build-merger@google.com> 1533231444 -0700

resolve merge conflicts of 1ddeb9e01f34bb4b3fe0ae46f7b37bbfb584d64a to stage-dr1-aosp-master
am: 08e080c314

Change-Id: I369a362e05923b6113b0c8e8e5c9da3bc122a5ee