tree 6022a824045cbe7cfdcc3bef8c55bc0376709d1e
parent b2dac7042315cceb978831432b1587d1a3cd90dc
parent 4e3e42bed8145dcb304f2cdd5a4c8f238e8e5e06
author Tao Bao <tbao@google.com> 1504907594 +0000
committer android-build-merger <android-build-merger@google.com> 1504907594 +0000

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

Change-Id: I413c3d1734c51046784b9f2b94a2305023c2a890