| commit | 426672be6785351c43c81b0560e16254d4d743c0 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Jun 15 00:32:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 00:32:57 2016 +0000 |
| tree | cb43da451579b07613d2ad5638ab42b2b022b581 | |
| parent | 61f4b66afe39616b574bdf0018acfa3a2f151a06 [diff] | |
| parent | 1842261dea35e9b0150fb384799855ffbc39cbcd [diff] |
resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea Change-Id: Ieb03649f3d7beb16f48986a5842ed6882b5162ab