tree 731db6adcba671f386ab2c5b0cde5cd86791aac1
parent 41be58d655336c27545374644afc54622da9e89b
parent 5f265ca961deb4acd1425e02b9310f4a336fac2c
author Tyler Gunn <tgunn@google.com> 1458323168 +0000
committer android-build-merger <android-build-merger@google.com> 1458323168 +0000

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

* commit '5f265ca961deb4acd1425e02b9310f4a336fac2c':
  DO NOT MERGE Register OnHoldTone event