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)
commit187f70c13342bb5b15b399e8609681fd093a85d4
tree9e3fbd4bc8c59bd4b1761a3361246d66d3017da7
parenta501546d8f6c9b1ee2a9a9218c16431c1de7b8ab
parentebb6a2a00a39fad28cb38d5cecb4cc6ef8ff384b
Merge "slideshow: Track the minui callback API change." am: e6fb950818 am: 0839a67e3f
am: ebb6a2a00a

Change-Id: I6c77e213a7d6aadfb074a2afdb3ca5801c93af3c