tree 20b9ecef0cbd281652417c97230feb09aa2f2003
parent 6d02eb62f0cf4bbf86d6d4c962776dcb19d9f93b
parent 21bcc03c159ab74a95be93e7e10b7704e22de687
author Stuart Scott <stuartscott@google.com> 1384223624 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384223624 -0800

am 21bcc03c: am a861b9ab: Build fix #2

* commit '21bcc03c159ab74a95be93e7e10b7704e22de687':
  Build fix #2