tree aebc7ead86825312727eea060dc4837842f9d181
parent 95cb5d2f124a214ba04940d51e41a1401fac30fe
parent 12400958a835850532300086807817ad7113d070
author Steve Paik <spaik@google.com> 1513644084 +0000
committer android-build-merger <android-build-merger@google.com> 1513644084 +0000

Merge "Create wrapper function for set_wakeup_callback" am: d848876ff7
am: 12400958a8

Change-Id: I384ae8f587795c00c9a42ead2fae9a46bc4ca5fd