tree 4593c7d852eeeceb8aa676efe013fa141676e711
parent 84dc7c8d68b8c8a1e3b6c8c3b124a7e2bf4f047d
parent 95588b8ff24659ce12b19241a903600f277e2262
author Karl Shaffer <karlshaffer@google.com> 1532119597 -0700
committer android-build-merger <android-build-merger@google.com> 1532119597 -0700

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

Change-Id: Iad5f5dbbc95d61f99690f09684024699fe8e9b05