tree e7d1a2f34275e0f3088210714ed347f5622db6bd
parent 8666b54366e52f2ea5df5ce039a1e12370846486
parent 03cb9d26e23a97c44bb4464f0a633a56d4391a98
author Bobby Georgescu <georgescu@google.com> 1343263847 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343263847 -0700

Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches