tree 3e2be4de3c4a1ca00678016714dcd99e2c7ed79c
parent 46bbbdd57755fb4e60a9a030f72c9736d2ead73d
parent 065103f24b0501d75d840973db06ed0eabf72f10
author Seungho Lee <shiny.lee@samsung.com> 1546551841 -0800
committer android-build-merger <android-build-merger@google.com> 1546551841 -0800

[automerger skipped] Merge "Update sound/vibrate notification key only when it actually buzz/beep." am: 5432355d0c am: 21d607da99
am: 065103f24b -s ours
am skip reason: change_id I208797f370ac5a30db5fcc316be956335a418319 with SHA1 55102a8ebd is in history

Change-Id: I86f14f31b3f9a165eb682231e1172775b8dda86f