| commit | b5dfaab47306dfb435d980edb9aa7617f9526265 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Jun 15 00:43:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 00:43:15 2016 +0000 |
| tree | 7a91c71a738770e8c7666638452c2d6efeb8cae4 | |
| parent | 5157deb652a94a072332e4b6777d226f84db73c3 [diff] | |
| parent | 426672be6785351c43c81b0560e16254d4d743c0 [diff] |
resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67 Change-Id: Ica8ebcf1220536470d53313b003840dee84e611e