From: Tenghui Zhu <ztenghui@google.com>
Date: Wed, 28 Aug 2013 16:54:26 +0000 (-0700)
Subject: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos... 
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~210
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=659df48f;p=android-x86%2Fpackages-apps-Camera2.git

am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad

* commit '09d5983dfbd252fca56ee8368906156e69a9fed0':
  Revert "Add rotate support in Film Strip"
---

659df48f1a84eb4498cd615ad79f39a7f45d7306