tree c2381d09ac6cd39d001a6f469eaa6849ab6ba779
parent de5af8b8fe829d0767dabf338e0090bab5ee9bf7
parent 35be91d00b7a1b23711d0d0fdbded0b745d95a5f
author Tyler Gunn <tgunn@google.com> 1458322889 +0000
committer android-build-merger <android-build-merger@google.com> 1458322889 +0000

DO NOT MERGE Register OnHoldTone event am: 7a65cb2  -s ours
am: 35be91d

* commit '35be91d00b7a1b23711d0d0fdbded0b745d95a5f':
  DO NOT MERGE Register OnHoldTone event