tree 4593c7d852eeeceb8aa676efe013fa141676e711
parent 3e8262d63321dcd54ba8b7362b755274246b887c
parent 393a97ff8bd7f9af6106d76820279939aa865c3c
author Karl Shaffer <karlshaffer@google.com> 1532119076 -0700
committer android-build-merger <android-build-merger@google.com> 1532119076 -0700

Merge "Updates Wear UI to Display Localized Recovery Text." am: 6bc9d605f3
am: 393a97ff8b

Change-Id: I1d51147f51130dd72c56421682a4a4dc2637212d