tree d9681631df73a04e432ed88fdf74fcae23ffb1a0
parent f134f0e5c0d168d77257074f57b67c98c8a02be8
parent f351a576ced3fdb5ec516654c522e68dd685a6d2
author Tao Bao <tbao@google.com> 1503950226 +0000
committer android-build-merger <android-build-merger@google.com> 1503950226 +0000

Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f
am: f351a576ce

Change-Id: Ida6b81f4d87550503e6a77e7163c1c50ebe0e36a