tree c6aa237728bff3d5ac24862ba35271860a3f053b
parent ad545464c2d543a7847cf2cacea11dc604d1c919
parent 58c4631c29b4f36737f261d1a2888e66592eda32
author Michael Wright <michaelwr@google.com> 1507657856 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507657856 +0000

Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev