tree c5656780056bf4ff214193006eab8e5a359ebaa0
parent 86d0be7a080ac73a053182a21dd383ba8634ead0
parent 1a64d2a42222811cce2b1c72e36768badb6e47eb
author Stuart Scott <stuartscott@google.com> 1384231948 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384231948 -0800

am 1a64d2a4: am 21bcc03c: am a861b9ab: Build fix #2

* commit '1a64d2a42222811cce2b1c72e36768badb6e47eb':
  Build fix #2