tree b3c27749acb586455c4037bdbe9c0449ceb0436e
parent 1427c1423fe496079df086699267a5a4d4f0521e
parent 771f86c1c99bcf9a62d990d0d0e5e0c4dfb8bd5d
author Stephen Hines <srhines@google.com> 1408752754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408752754 +0000

am 771f86c1: Merge "Fix PhaseBeam to build as API 17."

* commit '771f86c1c99bcf9a62d990d0d0e5e0c4dfb8bd5d':
  Fix PhaseBeam to build as API 17.