tree 62a95efc305c9a1dce6a81a3426c0117baba5a7b
parent cbb127a5283d8b0f0b13110e74d8797f772b30e7
parent d956b6328eac5fc75e70b387c971a991a87d0145
author Tianjie Xu <xunchang@google.com> 1521912119 +0000
committer android-build-merger <android-build-merger@google.com> 1521912119 +0000

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

Change-Id: I13394a33a4fa977b25fea69ada7fb786509b7ae8