| commit | c510a1f232bb60c97e6c1e9a7451be5c8f2c7e5d | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Jun 15 00:51:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 15 00:51:01 2016 +0000 |
| tree | 860f2dfc62fc1298ac8977a67b106cc64940a4e7 | |
| parent | 91848af26109a54372e115eee171cada578c9748 [diff] | |
| parent | ab5389446cab0c57b2804bad17f988ce4936b31d [diff] |
resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67 am: b5dfaab473 am: ab5389446c Change-Id: I9ac83e77acb3ac03ef885a2e2fcdebca270b1a03