tree 9255bfa5feec83f904dbe5f17679a85555c25bb9
parent fe47b3ee2413a53def2dff972527aba90b6e1739
parent 6b26798b3a5061e460c1180880e4023298791fbb
author Tao Bao <tbao@google.com> 1485305944 +0000
committer android-build-merger <android-build-merger@google.com> 1485305944 +0000

Merge "minui: Move callback functions to std::function." am: a476312714 am: 343987b2a1 am: 19856bcb2e
am: 6b26798b3a

Change-Id: I8fb3757de81e2d15e72df61951590653752df20c