tree b297aa2bee0d0b1968158b0fa68dbb05a9b21605
parent 19b3ab8b8466c723d2887689b192c6fe89fd31bc
parent 0224ee4bd32dbda5a906a8bfa3fb520a1a7e65e7
author Daniel Mentz <danielmentz@google.com> 1464911930 -0700
committer Daniel Mentz <danielmentz@google.com> 1466545134 -0700

Merge ASK 6.0.0

Ran libtoolize, autoreconf and make distclean in cmm and fci/lib.

A few changes had to be made to make it compile and run.

Change-Id: I1eec7dc501dca1be4382305305650f1a4735b060