tree 79e40b5e5b4d0f008418f673d0fb9cf736544121
parent 760a86d6b28aad3727badb83832fd96404c34bed
parent 99d2e724b33ce8a430022d574663daf170b73ef8
author Elliott Hughes <enh@google.com> 1498683407 -0700
committer Elliott Hughes <enh@google.com> 1498683407 -0700

resolve merge conflicts of 99d2e72 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08501e89613ea11d25d7de06ff47a7b545228b6c