| commit | 15db3551d005a58407a8ac97b73a879530dd3e74 | [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 | 6b6687bec97bb325f21fc9bfde8256430b55cc3c [diff] |
resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp Change-Id: Iead524946a84503a6e89c17861d3f54e4cf276a0