| commit | e12d5793b2562412ad1bff42ba371992e4fa452b | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Jul 14 15:40:25 2015 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Tue Jul 14 15:40:25 2015 -0700 |
| tree | 3ec45a43b3e893a188b11e61d6cb974ad7039bbe | |
| parent | 9e7c5035bff8ff9caf6ac223dec87801af99a0c6 [diff] |
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp Change-Id: Iead524946a84503a6e89c17861d3f54e4cf276a0