tree 6e0b0fae42120d8d170e5941f1ddea0053da5885
parent e779083f595d7b9c94d7bc01ed346b630c437e05
parent 27c4410a48522a9c17257ad985106b6f28834601
author Tao Bao <tbao@google.com> 1504290489 +0000
committer android-build-merger <android-build-merger@google.com> 1504290489 +0000

Merge "wear_ui: Remove backgroundIcon." am: 6e426f2b76 am: 3650e7c19b am: b457e24fac
am: 27c4410a48

Change-Id: I1e13196dbc4a8e56c0777db9844f74bf65964f20