tree 4593c7d852eeeceb8aa676efe013fa141676e711
parent c11cd3ccb81d8e73e9b97ece24eb94b32ac10adf
parent d275207d9d3426dbb1f48ab889560eefd4d9f891
author Karl Shaffer <karlshaffer@google.com> 1532119385 -0700
committer android-build-merger <android-build-merger@google.com> 1532119385 -0700

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

Change-Id: I78df47b4349fba82b4c0153f7e713992c70c7b10