tree f41b5f0355a1351e56e7ced22f4cc7658c45953f
parent 7c4205bdf25eb37c76b40cb61c98893b42b8eeef
parent 187f70c13342bb5b15b399e8609681fd093a85d4
author Tao Bao <tbao@google.com> 1485305948 +0000
committer android-build-merger <android-build-merger@google.com> 1485305948 +0000

Merge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f am: ebb6a2a00a
am: 187f70c133

Change-Id: Ia0f56a7812eab9a094405190208c9591308ba6d0