OSDN Git Service

Merge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f...
authorTao Bao <tbao@google.com>
Wed, 25 Jan 2017 00:59:08 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Jan 2017 00:59:08 +0000 (00:59 +0000)
am: 187f70c133

Change-Id: Ia0f56a7812eab9a094405190208c9591308ba6d0


Trivial merge