| commit | 1842261dea35e9b0150fb384799855ffbc39cbcd | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Jun 14 17:21:35 2016 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Tue Jun 14 17:21:35 2016 -0700 |
| tree | cb43da451579b07613d2ad5638ab42b2b022b581 | |
| parent | d40e8bab4b6b2bd486005de39691c8bffff2cd94 [diff] | |
| parent | 08f72b4693c0c25e4d7fae1cfd3cd8d2d643695c [diff] |
resolve merge conflicts of 08f72b4 to mnc-mr-docs Change-Id: Ibdd172d148d5983b6578adf7cb0e6335748ca654