tree 99990811f3e83478662f32c2a5807126853378de
parent 79be54c7f80dc373eaf5392629e8d3e74ac316de
parent 78266e0e11cd939fb813565e8736282cad83771b
author Michael Jurka <mikejurka@google.com> 1351193405 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351193405 -0700

am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
  Fix build.