| commit | d2ac2daeba4e882b150b49973712589f9392bf84 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Thu Oct 15 19:21:24 2015 -0700 |
| committer | Andrew Solovay <asolovay@google.com> | Thu Oct 15 19:22:41 2015 -0700 |
| tree | f6e5c52ba9adb8c8407ccaa6d1d82d7eb150630a | |
| parent | ae87b8d6213a4f26be67ea34c55f548896629e4d [diff] | |
| parent | 0f76f78f8274ed924fd922a619dd1c03f67b4ebf [diff] |
resolved conflicts for 0f76f78f to mnc-docs Change-Id: Ic513baabda9afb386a90fed03ff3be6658c01933