| commit | 9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 10:17:10 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Sep 13 10:17:10 2013 -0700 |
| tree | 78b8305d2601b0dd6ca016ee64a650f20a85f01d | |
| parent | e5412a9a9597433ae2540b390269c514c46402f1 [diff] | |
| parent | 05292dd65bc11da8c9be2aefda8354049c34052b [diff] |
resolved conflicts for merge of 05292dd6 to jb-mr1-dev Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617