tree a998a982f7527d35321ad156547c3ec69b76da96
parent 4b0b0391d5b3ef289e00423ec701b450ac2a0eb3
parent d47a3f3bbe5264061bf0c506976efafa0d0f2957
author John Spurlock <jspurlock@google.com> 1400455016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400455017 +0000

Merge "Quick settings touch feedback tweaks."