Merge remote-tracking branch 'goog/ics-ub-google-tts' into jb-mr2-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133

1 files changed, 11 insertions, 11 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index e9eb92f..35932f9 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -27,16 +27,16 @@ script_include_headers = fst/script/arcsort.h fst/script/arg-packs.h \
 fst/script/closure.h fst/script/compile-impl.h fst/script/compile.h \
 fst/script/compose.h fst/script/concat.h fst/script/connect.h \
 fst/script/convert.h fst/script/decode.h fst/script/determinize.h \
-fst/script/difference.h fst/script/draw-impl.h fst/script/draw.h \
-fst/script/encode.h fst/script/epsnormalize.h fst/script/equal.h \
-fst/script/equivalent.h fst/script/fst-class.h fst/script/fstscript.h \
-fst/script/info-impl.h fst/script/info.h fst/script/intersect.h \
-fst/script/invert.h fst/script/map.h fst/script/minimize.h \
-fst/script/print-impl.h fst/script/print.h fst/script/project.h \
-fst/script/prune.h fst/script/push.h fst/script/randequivalent.h \
-fst/script/randgen.h fst/script/register.h fst/script/relabel.h \
-fst/script/replace.h fst/script/reverse.h fst/script/reweight.h \
-fst/script/rmepsilon.h fst/script/script-impl.h \
+fst/script/difference.h fst/script/disambiguate.h  fst/script/draw-impl.h \
+fst/script/draw.h fst/script/encode.h fst/script/epsnormalize.h \
+fst/script/equal.h fst/script/equivalent.h fst/script/fst-class.h \
+fst/script/fstscript.h fst/script/info-impl.h fst/script/info.h \
+fst/script/intersect.h fst/script/invert.h fst/script/map.h \
+fst/script/minimize.h fst/script/print-impl.h fst/script/print.h \
+fst/script/project.h fst/script/prune.h fst/script/push.h \
+fst/script/randequivalent.h fst/script/randgen.h fst/script/register.h \
+fst/script/relabel.h fst/script/replace.h fst/script/reverse.h \
+fst/script/reweight.h fst/script/rmepsilon.h fst/script/script-impl.h \
 fst/script/shortest-distance.h fst/script/shortest-path.h \
 fst/script/symbols.h fst/script/synchronize.h fst/script/text-io.h \
 fst/script/topsort.h fst/script/union.h fst/script/weight-class.h \
@@ -67,7 +67,7 @@ fst/accumulator.h fst/interval-set.h fst/state-reachable.h \
 fst/lookahead-filter.h fst/generic-register.h fst/edit-fst.h \
 fst/replace-util.h fst/icu.h fst/string.h fst/signed-log-weight.h \
 fst/sparse-tuple-weight.h fst/sparse-power-weight.h fst/expectation-weight.h \
-fst/symbol-table-ops.h fst/bi-table.h \
+fst/symbol-table-ops.h fst/bi-table.h fst/mapped-file.h \
 $(far_include_headers) \
 $(ngram_include_headers) \
 $(pdt_include_headers) \