tree 4805e035e00fae606dd4571e340b1d51a73739b1
parent 4e321745173de1eb89343238fadfbcc7ba1a88f9
parent 7de7e0b0dd61acba813dec3a07d29f1d62026470
author Todd Kennedy <toddke@google.com> 1443218809 -0700
committer Todd Kennedy <toddke@google.com> 1443218809 -0700

resolved conflicts for 7de7e0b0 to stage-aosp-master

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30