From: Erin Dahlgren <edahlgren@google.com>
Date: Thu, 3 Oct 2013 22:41:53 +0000 (-0700)
Subject: am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~178
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f10aec6;p=android-x86%2Fpackages-apps-Camera2.git

am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad

* commit 'f56cc71eb5b0373b67729f5eb5f59dc1927b951d':
  Make space for photosphere rendering text
---

6f10aec6765021e7c022880786e3a24339b116f9