tree 5a9e003cea0de1156e6f7bd67e922bca78bdf423
parent 170e7e916ea49fa24fb1bca4190c6b1c8e4dc338
parent 0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1
author Christopher Tate <ctate@google.com> 1461286256 +0000
committer android-build-merger <android-build-merger@google.com> 1461286256 +0000

Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev
am: 0a7ec886c3

* commit '0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: Ifd44a119263b68ff6b67679931c579dcef622d0e