tree da198c92e97e2dd086d9743b7a3667cd76358a80
parent 4f72447fbfdf950d76050840efeab3e57f55cefe
author Todd Kennedy <toddke@google.com> 1443218809 -0700
committer Rom Lemarchand <romlem@google.com> 1447699433 -0800

resolved conflicts for 7de7e0b0 to stage-aosp-master

(cherry picked from commit 9f8602644418ecfb1a5c9555792ceed285fa72bd)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30