| commit | 2be96a1f666cce498cb4a2353c1faae4cacea003 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Sep 22 09:57:35 2015 -0700 |
| committer | Joe Fernandez <joefernandez@google.com> | Tue Sep 22 09:57:35 2015 -0700 |
| tree | 9088e1416737922eaa7ae9dc672ac450d9e6c9b3 | |
| parent | e7489fde9ff1529cc0c7a984046918a47b97b40c [diff] | |
| parent | 4f68b78406fc05f56e9a23b1cb937765be0499c7 [diff] |
resolved conflicts for 4f68b784 to mnc-preview-docs Change-Id: I850c65b3f1491d332a7d677d8e04c1ade67f6ba4