tree 2c2b416395f19080fdd38649eaad58156b04ec66
parent 94ec1cb3a13b03c09cffe0e1616222ca67ed44fa
parent b67ae42ad07ed6a5b4927c41089076e6eafd6949
author Marco Nelissen <marcone@google.com> 1447105566 +0000
committer android-build-merger <android-build-merger@google.com> 1447105566 +0000

Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 am: 8fb0121cb6
am: b67ae42ad0

* commit 'b67ae42ad07ed6a5b4927c41089076e6eafd6949':
  Fix race condition when setting default ringtones