tree ed48a00a97ba96e5388d1b3420ac425b81b35217
parent aa1fd354927981a647af84a14408744dc6179f37
parent 0d9ed295418d3d6e2dd7b15582b39ab583972d02
author Tao Bao <tbao@google.com> 1525390048 -0700
committer android-build-merger <android-build-merger@google.com> 1525390048 -0700

Merge "Move menu headers/items to std::vector<std::string>." am: fb86bb2a07
am: 0d9ed29541

Change-Id: I7428f86e9bc3e46c5bcf0afeb3cf5608be31e470