tree 62a95efc305c9a1dce6a81a3426c0117baba5a7b
parent ba0460c981d8178859d4987f3554401545228a71
parent baf619c21cf88c13d2a31e11b9146452fe20c279
author Tianjie Xu <xunchang@google.com> 1521911664 +0000
committer android-build-merger <android-build-merger@google.com> 1521911664 +0000

[automerger skipped]Merge "Factor out a menu class for screen ui" am: 549695ae65
am: baf619c21c  -s ours

Change-Id: Ifad3c7245cbf8770825f1ca3919ccd9169bf5f18