am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4...
am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit '6f7e39a6':
Add vibration override values for Galaxy S4 and HTC One