tree 744a199659d63576263bff9ae3d63fd748e45384
parent dda128abbf669c3309782e81e92d09f42b6227dc
parent 965021ab8d309246dc5fbd3296173220f99b8945
author Tao Bao <tbao@google.com> 1489765758 +0000
committer android-build-merger <android-build-merger@google.com> 1489765758 +0000

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

Change-Id: I31d1c3bb2729886457d4f5a573af7cd13cec74d2