tree 0c7be37f026aa24597356f26e0e6542aa5cf06fd
parent 6c694b6f0bd8c6ca4552d70ee3a538d51917337e
parent 71e9b049c21fb01d558f49844d17e792c347a930
author Dees Troy <dees_troy@teamw.in> 1391798335 +0100
committer Gerrit Code Review <gerrit2@gerrit> 1391798335 +0100

Merge "Add haptic feedback" into android-4.4