tree d3b1fb9511be234836e564349a0086a06ec5e4e0
parent 355148659ec47dcbc0e670da3d38b7590e33d366
parent 94c6f5e5c7a36c3d77fe811505e4d6da75955f92
author Doris Liu <tianliu@google.com> 1368470043 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368470043 -0700

am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit '25d69c11831fabf8f4e474aaf17b05dd001979ce':
  New count down beeps.