tree e68e20918057d4c1f88189edb49bcabad066535c
parent bf95fa4cdc7097b909cb22f7b9bddd8e9c3d7149
parent c512095e966349b7853c28a14fec1481fe3e690a
author Tianjie Xu <xunchang@google.com> 1540320274 -0700
committer android-build-merger <android-build-merger@google.com> 1540320274 -0700

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

Change-Id: I377869ef0519cf7d8157b657523c482b09dfc283