tree e68e20918057d4c1f88189edb49bcabad066535c
parent ccaf187c410a3d4341a6423d7c7b0db5b83db88d
parent 8bac38a0d63a78fdefbbbf7c470f1539748508da
author Tianjie Xu <xunchang@google.com> 1540319870 -0700
committer android-build-merger <android-build-merger@google.com> 1540319870 -0700

Merge "Add function to show localized rescue party menu" am: 06ccd00ef5
am: 8bac38a0d6

Change-Id: I56e05c2694acade00b64023e2f6d38898ca92a6a