tree 56d657b27d3a0f9eaf42df96a8eeaeed5dca2d4c
parent 92d167513d56a0e34d47e26d8be0f73e9c2730ad
parent 26d00e87f997434e3106add31143ff19d1586f75
author Tao Bao <tbao@google.com> 1489766149 +0000
committer android-build-merger <android-build-merger@google.com> 1489766149 +0000

Merge "Add the missing #include of <functional>." am: dd553d280f am: 965021ab8d
am: 26d00e87f9

Change-Id: Ib707f1282c3280374a014fadd7f27580f8bedaf0