| commit | 8fb8207412905d034305b4b1be6eac07bdac833f | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jun 24 15:59:18 2015 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Wed Jun 24 15:59:18 2015 -0700 |
| tree | 1674d1c43668ed19eb9b4e90dd252b3c5d94f045 | |
| parent | 43f6e345ed28f697cec2ece73c6b46bf99482f55 [diff] | |
| parent | 0f14548cd1dc5fe70075567bb5704f4bf6ca55b4 [diff] |
resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43