| commit | eb550a00144478857030c5ab50dcd21ab41a8560 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Wed Jul 15 13:13:03 2015 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Wed Jul 15 13:13:03 2015 -0700 |
| tree | 3ec45a43b3e893a188b11e61d6cb974ad7039bbe | |
| parent | e12d5793b2562412ad1bff42ba371992e4fa452b [diff] | |
| parent | ee2e4b83e88a3845a5e66b079b9fbb6f718616d6 [diff] |
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp Change-Id: Ie42fdb98f0d7d9fe2fd2741c8b0bc46546b0bb73