tree fa6f504a4b15589c3277c2892d027f9657ad5b28
parent b990b9acc71bd7f4b03fcccc2ac26c4194851be6
parent 31c5deff8592f3fa7a0426703297f81bf2a18329
author Brad Ebinger <breadley@google.com> 1487807151 -0800
committer Brad Ebinger <breadley@google.com> 1487807151 -0800

resolve merge conflicts of 31c5def to stage-aosp-master

Change-Id: I405459b614da22a6b69bee9a76a8404e42d03bb4