tree ed48a00a97ba96e5388d1b3420ac425b81b35217
parent 44a3a0b9f104a410f6e57409c239176517825962
parent 3777c4b8597f4a6fc46e57305d7aa33040c3b7bf
author Tao Bao <tbao@google.com> 1525392654 -0700
committer android-build-merger <android-build-merger@google.com> 1525392654 -0700

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

Change-Id: I208d2804c2fc6634c8464fdb700756ade977b908