tree e68e20918057d4c1f88189edb49bcabad066535c
parent 040335059e1e1b7d12c73f922e0597c80b87849d
parent 06ccd00ef5bfa36f8f0d508df77f747aa099eabf
author Tianjie Xu <xunchang@google.com> 1540319674 -0700
committer android-build-merger <android-build-merger@google.com> 1540319674 -0700

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

Change-Id: I2d92732da1fdcdcf535272437c7398519872c6a9