tree 579daf90f697f08e4cd78d57cf2872f61ea5a32b
parent dee9d17c6855b9d34a9cd0e7946c5890a83a583b
parent 02088f449763109a95effdf5e48230620ae33e42
author Tadashi G. Takaoka <takaoka@google.com> 1369982707 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369982707 +0000

Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev