tree 87a84fa6e3a4fac6a0fd06917e4031208bf103fc
parent ff0bcf6befe17764773399a73a8d2960295c0c64
parent 77425c5e1583fdbd1de217de5af6d2a1292fa75a
author Tao Bao <tbao@google.com> 1504907835 +0000
committer android-build-merger <android-build-merger@google.com> 1504907835 +0000

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

Change-Id: I6bf15912d53af213fde9225061367e1edfb4c2ec