tree 907bfdef2e3dc28602ca4ea4f30201808b96da5b
parent e29807352afc739dbd1e1b8083fa15d359436374
parent 99c932716af8ea27212e9c0cab725e55156dfd0c
author Tao Bao <tbao@google.com> 1503952719 +0000
committer android-build-merger <android-build-merger@google.com> 1503952719 +0000

Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce am: 813120749d
am: 99c932716a

Change-Id: Id6fb5f3a2ef9135e5cfb0caa147a0640505492fc