tree 59fcb08db4b6ac04f2fdce422dc4fa9ef4e60dfb
parent baa4f0d2af970e014bb7b48f7dc8a5b92eb29bee
parent 6171da90c5cb2090c584afd275b255cc2d2ff1ce
author Tao Bao <tbao@google.com> 1526444423 -0700
committer android-build-merger <android-build-merger@google.com> 1526444423 -0700

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

Change-Id: I53abe3ff30d8d60389a429c837c230758af54d50