tree 772b24b1c9b80e9b84e2ca36ba8aa1dd720fd99b
parent 8567eb4b11bfb97e774ff29adcbb157df051de12
parent 19856bcb2e31ebd0a23392dd38b10bd344fdbd5a
author Tao Bao <tbao@google.com> 1485305853 +0000
committer android-build-merger <android-build-merger@google.com> 1485305853 +0000

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

Change-Id: Ifed7e368ce476adac7361b2480091693e2446898