tree df5394b84b323b8f21031bd5eb3bffde55481ab7
parent 7907271af1f9024b1c5896a2d5006f7c868c771c
parent 8fb0121cb60ddf54a22bff088670594f422edea9
author Marco Nelissen <marcone@google.com> 1447105181 +0000
committer android-build-merger <android-build-merger@google.com> 1447105181 +0000

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

* commit '8fb0121cb60ddf54a22bff088670594f422edea9':
  Fix race condition when setting default ringtones