| commit | 9f22aef0c9d7d1bd9aecad7ed6e047ea78d3f7c8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 03 15:29:32 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Oct 03 15:29:32 2014 -0700 |
| tree | 0668c5d92eaaf97adb667b399862f873f0d78701 | |
| parent | 04c4b5ea9f5aecfdb4b68025ae8c9e34e12c70dc [diff] | |
| parent | 57ec13b298d579bd9a39c82e7c8ac44fe4d6a2f0 [diff] |
resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6