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, 1 insertions, 3 deletions

diff --git a/src/include/fst/arc-map.h b/src/include/fst/arc-map.h
index 914f81c..c33b546 100644
--- a/src/include/fst/arc-map.h
+++ b/src/include/fst/arc-map.h
@@ -165,8 +165,8 @@ void ArcMap(MutableFst<A> *fst, C* mapper) {
           } else {
             fst->SetFinal(s, final_arc.weight);
           }
-          break;
         }
+        break;
       }
       case MAP_REQUIRE_SUPERFINAL: {
         if (s != superfinal) {
@@ -315,8 +315,6 @@ class ArcMapFstImpl : public CacheImpl<B> {
   using FstImpl<B>::SetInputSymbols;
   using FstImpl<B>::SetOutputSymbols;
 
-  using VectorFstBaseImpl<typename CacheImpl<B>::State>::NumStates;
-
   using CacheImpl<B>::PushArc;
   using CacheImpl<B>::HasArcs;
   using CacheImpl<B>::HasFinal;