tree 78b8305d2601b0dd6ca016ee64a650f20a85f01d
parent e5412a9a9597433ae2540b390269c514c46402f1
parent 05292dd65bc11da8c9be2aefda8354049c34052b
author Elliott Hughes <enh@google.com> 1379092630 -0700
committer Elliott Hughes <enh@google.com> 1379092630 -0700

resolved conflicts for merge of 05292dd6 to jb-mr1-dev

Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617