tree 5ad9fcc118ee3b6ede986e6b2817338f87d5e92a
parent 3ac63f370c6d123e23aa55b3c20a8cc196133827
parent 8ca81ce581dddaa752e9c8c18b5c63e6db72e79f
author Tao Bao <tbao@google.com> 1504908296 +0000
committer android-build-merger <android-build-merger@google.com> 1504908296 +0000

Merge "ui: Manage menu_ with std::vector." am: f51bb0f2d6 am: 4e3e42bed8 am: 77425c5e15
am: 8ca81ce581

Change-Id: I146243036bd582425a558d2f3ae96fff4b404e76