tree 3ee35b1221abbd327f794067dae8eb6abed0f0cf
parent b5742f997d3179f57c305c940dda35bf2f2aedc4
parent 265f8106c374ce72284e86a5bb6df4514d320d51
author Alan Viverette <alanv@google.com> 1414101823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414101823 +0000

am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev

* commit '265f8106c374ce72284e86a5bb6df4514d320d51':
  Swap names for clock delegates so they are correct