tree 59fcb08db4b6ac04f2fdce422dc4fa9ef4e60dfb
parent 554a876cc13a365b9aaa7d8131d2433b16962780
parent b730743b4051a671e757feb644135974ed2bc5c2
author Tao Bao <tbao@google.com> 1526444182 -0700
committer android-build-merger <android-build-merger@google.com> 1526444182 -0700

Merge "wear_ui: Address a TODO regarding {intro,loop}_frames." am: 0f3aa6ec38
am: b730743b40

Change-Id: I0a8ba6bf7836bde00e93f2ce9a011ace9acbac5d