tree acb17e05f98f4425da4b1473cce2e73cccf3586d
parent 813120749d0ee2463f2a70b2d1cc0ed3b11283d8
parent d92baf5988968a52ea1bef103baae1217e3ff2e2
author Tao Bao <tbao@google.com> 1503950239 +0000
committer android-build-merger <android-build-merger@google.com> 1503950239 +0000

Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0
am: d92baf5988

Change-Id: Id98f998569e0e07296d69030c3d555cd32203e70