tree 998e927f90ed9ebdd658c78ec9def6ac581b999b
parent 6bf0344e608fa6df04a552ff43002bc7ffd3cab0
parent c399e4d96445f59e9ea970d5ba4f25a2badc9b2e
author Michal Karpinski <mkarpinski@google.com> 1485442721 +0000
committer android-build-merger <android-build-merger@google.com> 1485442721 +0000

Merge "DO NOT MERGE Change batch finalization timeout mechanism from Handler#sendMessageDelayed() to a wakeful alarm" into nyc-mr2-dev
am: c399e4d964

Change-Id: I9658d27ee9a694c580204f0e041991d754f93130