tree b0aca68ea1bebf55dfaaa9af4261ecf2169452c5
parent a9f970bea008717b0428f6a571309014b77c9c0c
parent 0aeb37438096068c2209c3ac4d2397f7bb6a7bc2
author Jack He <siyuanh@google.com> 1522081410 +0000
committer android-build-merger <android-build-merger@google.com> 1522081410 +0000

Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev
am: 0aeb374380

Change-Id: I469475c793e5e04f3550d959415ff04c22da6952