tree 9d2ce8b76c73c083504c0b191d3a7d6f06cdb44a
parent f0ae69e87e83c25d658615b98ea3230704f0699d
parent b054811d5e35cf9660e2be52f96005e764c1ddd8
author Tyler Gunn <tgunn@google.com> 1505933438 +0000
committer android-build-merger <android-build-merger@google.com> 1505933438 +0000

resolve merge conflicts of 80ccafe55 to stage-aosp-master
am: b054811d5e

Change-Id: Ie1b08005a9a4e8fe7091ea926b508859cea28d18