| commit | 2029791350328fa1eb461c7b9b26710b8004163d | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Tue Sep 15 19:18:15 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Tue Sep 15 19:18:15 2015 -0700 |
| tree | 708d3a417e82eb715d87dc565dbc0a312be95348 | |
| parent | 8b037b6765ac6390e0fe6217aba9eac592f2a108 [diff] | |
| parent | f4fc29b08c4d3f8620ceffd233c99dc0712fed78 [diff] |
resolved conflicts for f4fc29b0 to mnc-dr-dev-plus-aosp Change-Id: Ieee6621881ace1631ae53d2a5879c271ba45382f