tree 5bfe06bb56a6f4ae5647ee64032b28df47addb0d
parent dfd04923541de579e99ac8dacc678abb3a3e3f33
parent ddb542f5745d37a8d5b72732f67a4e60b895254b
author Paul Crowley <paulcrowley@google.com> 1498689950 +0000
committer android-build-merger <android-build-merger@google.com> 1498689950 +0000

resolve merge conflicts of 4ad7784 to stage-aosp-master
am: ddb542f574

Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948