tree 2267c6a4536638ac8e1a91c8de2510abcba03939
parent f5b421426d11c1d08ed2aca1566956e16cdd39a7
parent d9c540a9ede1ee48e6e60c3ace8a923d9c8809e7
author Mark De Ruyter <markdr@google.com> 1529704446 -0700
committer Mark De Ruyter <markdr@google.com> 1529704525 +0000

resolve merge conflicts of d9c540a9ede1ee48e6e60c3ace8a923d9c8809e7 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie62589ce86b42a10f88acb4291b623375c1160b5