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:57:35 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Jan 2017 00:57:35 +0000 (00:57 +0000)
am: ebb6a2a00a

Change-Id: I6c77e213a7d6aadfb074a2afdb3ca5801c93af3c


Trivial merge